李涵 / shipin · 提交

转到一个项目

作者 李洪娟
提交 2622bda7e45cd90f341cc6defc0ed4cc08a0abfb 2 个父辈 d4f97bfd 4da7a6d4

合并分支 'lihongjuan' 到 'master' 

Lihongjuan



查看合并请求 !5
内嵌 并排对比
正在显示 15 个修改的文件 包含 377 行增加 和 94 行删除
... ... @@ -27,8 +27,8 @@
<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" />
<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>
... ... @@ -37,31 +37,34 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<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">
<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="-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>
</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="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="-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="-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" />
<folding>
<element signature="n#!!doc" expanded="true" />
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" 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="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="-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 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" />
<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>
... ... @@ -69,38 +72,41 @@
<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="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="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>
</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="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.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 vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941">
<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>
</file>
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<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.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="0.0" vertical-offset="639" max-vertical-offset="3575">
<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>
</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="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="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" />
<state vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="5934">
<caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
<folding />
</state>
</provider>
... ... @@ -109,18 +115,18 @@
<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="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" />
<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="cookie.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/cookie.js">
<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="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="-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>
... ... @@ -132,16 +138,22 @@
<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$/js/takedetails.js" />
<option value="$PROJECT_DIR$/take_details.html" />
<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$/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$/order.html" />
</list>
</option>
</component>
... ... @@ -206,6 +218,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,9 +246,55 @@
<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="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>
</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>
... ... @@ -239,6 +311,11 @@
<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="F:\project\shipin\img" />
</key>
</component>
<component name="RunManager">
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<method />
... ... @@ -291,7 +368,7 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="2" width="1932" height="1051" extended-state="1" />
<frame x="-7" y="2" width="1932" height="1051" extended-state="0" />
<editor active="true" />
<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" />
... ... @@ -300,6 +377,8 @@
<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" />
... ... @@ -307,11 +386,9 @@
<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="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" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
... ... @@ -356,7 +433,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>
... ... @@ -389,7 +466,9 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477">
<caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" />
<folding />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -437,7 +516,9 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477">
<caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" />
<folding />
<folding>
<element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -487,77 +568,152 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/personcenter.js">
<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="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" />
<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$/PersonCenter/PersonCenter.html">
<entry file="file://$PROJECT_DIR$/myorder/myorder.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" />
<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>
<entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
<entry file="file://$PROJECT_DIR$/js/shopcar.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="-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>
<entry file="file://$PROJECT_DIR$/js/addressdetail.js">
<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>
<entry file="file://$PROJECT_DIR$/css/index.css">
<entry file="file://$PROJECT_DIR$/myorder/takedetails.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840">
<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="-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>
<entry file="file://$PROJECT_DIR$/myorder/myorder.html">
<entry file="file://$PROJECT_DIR$/take_details.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="-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>
<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="-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="-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>
<entry file="file://$PROJECT_DIR$/js/shopcar.js">
<entry file="file://$PROJECT_DIR$/js/takedetails.js">
<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="-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>
<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>
<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">
<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$/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$/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">
<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#!!doc" expanded="true" />
<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$/index.html">
<entry file="file://$PROJECT_DIR$/css/init.css">
<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="0.0" vertical-offset="639" max-vertical-offset="3575">
<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$/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" />
<folding />
<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" />
<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.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" />
<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>
... ...
... ... @@ -16,7 +16,6 @@
}
</style>
</head>
<body>
<div class="container" id="personcenter" v-cloak>
<!--遮罩-->
... ... @@ -26,9 +25,29 @@
<p>— 咨询热线 —</p>
<span>1540098838</span>
<div class="popup_footer">
立即拨打
<a href="tel:1540098838">立即拨打</a>
</div>
</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>
<!--个人信息-->
... ... @@ -84,7 +103,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>
... ...
... ... @@ -10,10 +10,16 @@
<link rel="stylesheet" type="text/css" href="css/index.css" />
<script src="js/base.js" type="text/javascript" charset="utf-8"></script>
<title>门店详情</title>
<style>
[v-cloak]{
display:none;
}
</style>
</head>
<body>
<div class="container" id="addressdetail">
<div class="container" id="addressdetail" v-cloak>
<div class="add_wrap">
<div class="add_wrap_text">
<p style="font-size: 0.3rem;margin-bottom: 0.3rem;">{{address.store_name}}<span style="font-size: 0.28rem; color: #FCB801; margin-left: 0.31rem;">距您{{address.distance_text}}</span></p>
... ... @@ -22,6 +28,7 @@
</div>
<span>场景图片</span>
<div class="address_pic_list" v-html="photo">
{{photo}}
<!--<img src="img/2@2x.png" />-->
<!--<img src="img/@2x.png" />-->
<!--<img src="img/2@2x.png" />-->
... ...
... ... @@ -52,6 +52,70 @@
color: #FFFFFF;
font-size: 0.3rem;
}
/*分享页面弹出层*/
.sharewrap{
width: 7.5rem;
height: 100%;
background-color:rgba(0,0,0,0.5);
position: fixed;
z-index: 2;
margin-left: -0.4rem;
/*display: none;*/
}
.sharepopup{
width: 5.48rem;
/**/
position: absolute;
z-index: 3;
/*background-color: #FFFFFF;*/
left: 1rem;
top: 2.5rem;
display: flex;
flex-direction: column;
align-items: center;
border-radius: 0.15rem;
overflow: hidden;
}
.sharetext{
width:3.48rem;
position: absolute;
z-index: 3;
/*background-color: #FFFFFF;*/
left: 2rem;
top: 7.8rem;
display: flex;
flex-direction: column;
align-items: center;
border-radius: 0.15rem;
overflow: hidden;
}
.sharecontent{
position: absolute;
z-index: 3;
font-size: 0.36rem;
color:#D43D31;
left: 3rem;
top: 7.85rem;
}
.rowwrap{
width: 7.5rem;
height: 100%;
background-color:rgba(0,0,0,0.5);
position: fixed;
z-index: 2;
margin-left: -0.4rem;
/*display:none;*/
}
.rowpopup {
width: 7.5rem;
height: 100%;
position: absolute;
z-index: 3;
display: flex;
flex-direction: column;
align-items: center;
overflow: hidden;
}
/*个人信息*/
.person_info{
display: flex;
... ...
... ... @@ -440,6 +440,7 @@
.footer_item span {
color: #999999;
}
.footer_item img {
... ...
... ... @@ -47,6 +47,7 @@ body {
height: 100%;
padding: 0;
margin: 0;
/*overflow: hidden;*/
background-color: RGBA(245, 246, 250, 1);
}
... ...

30.2 KB
... ... @@ -247,7 +247,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>
... ...
... ... @@ -4,7 +4,9 @@ new Vue({
data: {
persontype:[],
personinfo:[],
cartnum:0
cartnum:0,
shareimg:false,
rowshare:false
},
created: function() {
... ... @@ -47,6 +49,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=linkPath+'/about.html'
... ...
... ... @@ -11,9 +11,9 @@ new Vue({
data: {
//详细地址
spotdetail: {
photo: "",
spot_detail_address: "",
},
//photo: "",
//spot_detail_address: ""
}
},
created: function() {
... ... @@ -26,22 +26,23 @@ new Vue({
var that = this;
var url = '/Spot/detail'
var params = {
id: spotid,
id: spotid
}
ajaxsend(url, params, function(res) {
/*console.log(JSON.stringify(res))*/
console.log(res);
var data=res.data;
that.spotdetail.spot_detail_address=data.spot_detail_address;
var photo=data.photo;
photo=JSON.stringify(photo);
that.spotdetail.photo=photo;
console.log(that.spotdetail.photo);
that.spotdetail=data;
//that.spotdetail.spot_detail_address=data.spot_detail_address;
//var photo=data.photo;
// photo=JSON.stringify(photo);
//that.spotdetail.photo=photo;
//console.log(that.spotdetail.photo);
})
},
}
},
}
})
... ...
... ... @@ -507,7 +507,7 @@
<div class="weui-cell">
<div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div>
<div class="weui-cell__bd" style="margin-left: 47px;font-size: 0.3rem;color:#333333">
<div class="weui-cell__bd" style="margin-left:0.4rem;font-size: 0.3rem;color:#333333">
<input class="weui-input" id="time4" type="text" value="">
</div>
</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_l5rjgpoksoj62yb9.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,12 +55,14 @@
text-align: center;
line-height: 0.36rem;
}
#unstock{
line-height: 2rem;
}
</style>
</head>
<body onload="load()">
<div class="container" style="overflow-x: hidden;" id="shopcar">
<div class="container" style="overflow-x: hidden;padding-bottom: 2rem" id="shopcar">
<div class="shop_car_item" data-allmoney='' v-cloak v-for="(item,index) in carlist" v-bind:id="item.cart_id" v-if="item .goods_num>0">
<input type="checkbox" class="choose" :checked="item.checked" name="" id="" value="" @click="check(item,index)"/>
<img v-bind:src="item.thumb" />
... ... @@ -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>
... ...
... ... @@ -10,10 +10,16 @@
<link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/index.css" />
<script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script>
<title>门店详情</title>
<style>
[v-cloak]{
display:none;
}
</style>
</head>
<body>
<div class="container" id="spotdetail">
<div class="container" id="spotdetail" v-cloak>
<div class="add_wrap">
<div class="add_wrap_text">
... ... @@ -22,6 +28,7 @@
</div>
<span>场景图片</span>
<div class="address_pic_list" v-html="spotdetail.photo">
{{spotdetail.photo}}
</div>
</div>
</div>
... ...