李涵 / shipin · 提交

转到一个项目

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

合并分支 'lihongjuan' 到 'master' 

Lihongjuan



查看合并请求 !5
内嵌 并排对比
正在显示 15 个修改的文件 包含 377 行增加 和 94 行删除
@@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
27 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 27 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
28 <entry file="file://$PROJECT_DIR$/index.html"> 28 <entry file="file://$PROJECT_DIR$/index.html">
29 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
30 - <state vertical-scroll-proportion="-16.678572" vertical-offset="4984" max-vertical-offset="8119">  
31 - <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" /> 30 + <state vertical-scroll-proportion="-6.775862" vertical-offset="6330" max-vertical-offset="9531">
  31 + <caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
@@ -37,31 +37,34 @@ @@ -37,31 +37,34 @@
37 <file leaf-file-name="index.js" pinned="false" current-in-tab="false"> 37 <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/js/index.js"> 38 <entry file="file://$PROJECT_DIR$/js/index.js">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="-29.16" vertical-offset="5589" max-vertical-offset="12532">  
41 - <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" /> 40 + <state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532">
  41 + <caret line="422" column="12" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="12" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
45 </entry> 45 </entry>
46 </file> 46 </file>
47 - <file leaf-file-name="shopcar.js" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/js/shopcar.js"> 47 + <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/shopcar.html">
49 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
50 - <state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775">  
51 - <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> 50 + <state vertical-scroll-proportion="-14.464286" vertical-offset="1620" max-vertical-offset="4995">
  51 + <caret line="75" column="91" selection-start-line="75" selection-start-column="91" selection-end-line="75" selection-end-column="91" />
52 <folding> 52 <folding>
53 - <element signature="n#!!doc" expanded="true" /> 53 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
54 </folding> 54 </folding>
55 </state> 55 </state>
56 </provider> 56 </provider>
57 </entry> 57 </entry>
58 </file> 58 </file>
59 - <file leaf-file-name="myorder.html" pinned="false" current-in-tab="false">  
60 - <entry file="file://$PROJECT_DIR$/myorder/myorder.html"> 59 + <file leaf-file-name="order.html" pinned="false" current-in-tab="true">
  60 + <entry file="file://$PROJECT_DIR$/order.html">
61 <provider selected="true" editor-type-id="text-editor"> 61 <provider selected="true" editor-type-id="text-editor">
62 - <state vertical-scroll-proportion="-28.785715" vertical-offset="0" max-vertical-offset="6058">  
63 - <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />  
64 - <folding /> 62 + <state vertical-scroll-proportion="0.39649123" vertical-offset="13161" max-vertical-offset="21033">
  63 + <caret line="500" column="44" selection-start-line="500" selection-start-column="44" selection-end-line="500" selection-end-column="44" />
  64 + <folding>
  65 + <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" />
  66 + <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" />
  67 + </folding>
65 </state> 68 </state>
66 </provider> 69 </provider>
67 </entry> 70 </entry>
@@ -69,38 +72,41 @@ @@ -69,38 +72,41 @@
69 <file leaf-file-name="index.css" pinned="false" current-in-tab="false"> 72 <file leaf-file-name="index.css" pinned="false" current-in-tab="false">
70 <entry file="file://$PROJECT_DIR$/css/index.css"> 73 <entry file="file://$PROJECT_DIR$/css/index.css">
71 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
72 - <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">  
73 - <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> 75 + <state vertical-scroll-proportion="0.0" vertical-offset="10746" max-vertical-offset="18225">
  76 + <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />
74 <folding /> 77 <folding />
75 </state> 78 </state>
76 </provider> 79 </provider>
77 </entry> 80 </entry>
78 </file> 81 </file>
79 - <file leaf-file-name="swiper-3.4.2.min.css" pinned="false" current-in-tab="false">  
80 - <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css"> 82 + <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
  83 + <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
81 <provider selected="true" editor-type-id="text-editor"> 84 <provider selected="true" editor-type-id="text-editor">
82 - <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">  
83 - <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />  
84 - <folding /> 85 + <state vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941">
  86 + <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
  87 + <folding>
  88 + <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" />
  89 + <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" />
  90 + </folding>
85 </state> 91 </state>
86 </provider> 92 </provider>
87 </entry> 93 </entry>
88 </file> 94 </file>
89 - <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="true">  
90 - <entry file="file://$PROJECT_DIR$/shopcar.html"> 95 + <file leaf-file-name="init.css" pinned="false" current-in-tab="false">
  96 + <entry file="file://$PROJECT_DIR$/css/init.css">
91 <provider selected="true" editor-type-id="text-editor"> 97 <provider selected="true" editor-type-id="text-editor">
92 - <state vertical-scroll-proportion="-0.14350283" vertical-offset="2260" max-vertical-offset="4941">  
93 - <caret line="79" column="18" selection-start-line="79" selection-start-column="18" selection-end-line="79" selection-end-column="18" /> 98 + <state vertical-scroll-proportion="0.0" vertical-offset="639" max-vertical-offset="3575">
  99 + <caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
94 <folding /> 100 <folding />
95 </state> 101 </state>
96 </provider> 102 </provider>
97 </entry> 103 </entry>
98 </file> 104 </file>
99 - <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">  
100 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> 105 + <file leaf-file-name="PersonCenter.css" pinned="false" current-in-tab="false">
  106 + <entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css">
101 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
102 - <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">  
103 - <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> 108 + <state vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="5934">
  109 + <caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
104 <folding /> 110 <folding />
105 </state> 111 </state>
106 </provider> 112 </provider>
@@ -109,18 +115,18 @@ @@ -109,18 +115,18 @@
109 <file leaf-file-name="personcenter.js" pinned="false" current-in-tab="false"> 115 <file leaf-file-name="personcenter.js" pinned="false" current-in-tab="false">
110 <entry file="file://$PROJECT_DIR$/js/personcenter.js"> 116 <entry file="file://$PROJECT_DIR$/js/personcenter.js">
111 <provider selected="true" editor-type-id="text-editor"> 117 <provider selected="true" editor-type-id="text-editor">
112 - <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">  
113 - <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> 118 + <state vertical-scroll-proportion="-33.44" vertical-offset="1062" max-vertical-offset="2886">
  119 + <caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
114 <folding /> 120 <folding />
115 </state> 121 </state>
116 </provider> 122 </provider>
117 </entry> 123 </entry>
118 </file> 124 </file>
119 - <file leaf-file-name="cookie.js" pinned="false" current-in-tab="false">  
120 - <entry file="file://$PROJECT_DIR$/js/cookie.js"> 125 + <file leaf-file-name="takedetails.js" pinned="false" current-in-tab="false">
  126 + <entry file="file://$PROJECT_DIR$/js/takedetails.js">
121 <provider selected="true" editor-type-id="text-editor"> 127 <provider selected="true" editor-type-id="text-editor">
122 - <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">  
123 - <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" /> 128 + <state vertical-scroll-proportion="-16.2" vertical-offset="81" max-vertical-offset="1458">
  129 + <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
124 <folding /> 130 <folding />
125 </state> 131 </state>
126 </provider> 132 </provider>
@@ -132,16 +138,22 @@ @@ -132,16 +138,22 @@
132 <option name="CHANGED_PATHS"> 138 <option name="CHANGED_PATHS">
133 <list> 139 <list>
134 <option value="$PROJECT_DIR$/js/base.js" /> 140 <option value="$PROJECT_DIR$/js/base.js" />
135 - <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />  
136 <option value="$PROJECT_DIR$/js/cookie.js" /> 141 <option value="$PROJECT_DIR$/js/cookie.js" />
137 - <option value="$PROJECT_DIR$/js/personcenter.js" />  
138 <option value="$PROJECT_DIR$/css/swiper-3.4.2.min.css" /> 142 <option value="$PROJECT_DIR$/css/swiper-3.4.2.min.css" />
139 - <option value="$PROJECT_DIR$/css/index.css" />  
140 <option value="$PROJECT_DIR$/myorder/myorder.html" /> 143 <option value="$PROJECT_DIR$/myorder/myorder.html" />
141 <option value="$PROJECT_DIR$/js/index.js" /> 144 <option value="$PROJECT_DIR$/js/index.js" />
142 <option value="$PROJECT_DIR$/js/shopcar.js" /> 145 <option value="$PROJECT_DIR$/js/shopcar.js" />
  146 + <option value="$PROJECT_DIR$/js/takedetails.js" />
  147 + <option value="$PROJECT_DIR$/take_details.html" />
  148 + <option value="$PROJECT_DIR$/addressdetails.html" />
  149 + <option value="$PROJECT_DIR$/js/personcenter.js" />
  150 + <option value="$PROJECT_DIR$/css/PersonCenter/PersonCenter.css" />
  151 + <option value="$PROJECT_DIR$/css/index.css" />
143 <option value="$PROJECT_DIR$/index.html" /> 152 <option value="$PROJECT_DIR$/index.html" />
  153 + <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />
  154 + <option value="$PROJECT_DIR$/css/init.css" />
144 <option value="$PROJECT_DIR$/shopcar.html" /> 155 <option value="$PROJECT_DIR$/shopcar.html" />
  156 + <option value="$PROJECT_DIR$/order.html" />
145 </list> 157 </list>
146 </option> 158 </option>
147 </component> 159 </component>
@@ -206,6 +218,20 @@ @@ -206,6 +218,20 @@
206 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 218 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
207 </PATH_ELEMENT> 219 </PATH_ELEMENT>
208 <PATH_ELEMENT> 220 <PATH_ELEMENT>
  221 + <option name="myItemId" value="PersonCenter" />
  222 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  223 + </PATH_ELEMENT>
  224 + </PATH>
  225 + <PATH>
  226 + <PATH_ELEMENT>
  227 + <option name="myItemId" value="TakeFood" />
  228 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  229 + </PATH_ELEMENT>
  230 + <PATH_ELEMENT>
  231 + <option name="myItemId" value="shipin" />
  232 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  233 + </PATH_ELEMENT>
  234 + <PATH_ELEMENT>
209 <option name="myItemId" value="myorder" /> 235 <option name="myItemId" value="myorder" />
210 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 236 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
211 </PATH_ELEMENT> 237 </PATH_ELEMENT>
@@ -220,9 +246,55 @@ @@ -220,9 +246,55 @@
220 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 246 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
221 </PATH_ELEMENT> 247 </PATH_ELEMENT>
222 <PATH_ELEMENT> 248 <PATH_ELEMENT>
  249 + <option name="myItemId" value="js" />
  250 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  251 + </PATH_ELEMENT>
  252 + </PATH>
  253 + <PATH>
  254 + <PATH_ELEMENT>
  255 + <option name="myItemId" value="TakeFood" />
  256 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  257 + </PATH_ELEMENT>
  258 + <PATH_ELEMENT>
  259 + <option name="myItemId" value="shipin" />
  260 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  261 + </PATH_ELEMENT>
  262 + <PATH_ELEMENT>
  263 + <option name="myItemId" value="img" />
  264 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  265 + </PATH_ELEMENT>
  266 + </PATH>
  267 + <PATH>
  268 + <PATH_ELEMENT>
  269 + <option name="myItemId" value="TakeFood" />
  270 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  271 + </PATH_ELEMENT>
  272 + <PATH_ELEMENT>
  273 + <option name="myItemId" value="shipin" />
  274 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  275 + </PATH_ELEMENT>
  276 + <PATH_ELEMENT>
  277 + <option name="myItemId" value="css" />
  278 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  279 + </PATH_ELEMENT>
  280 + </PATH>
  281 + <PATH>
  282 + <PATH_ELEMENT>
  283 + <option name="myItemId" value="TakeFood" />
  284 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  285 + </PATH_ELEMENT>
  286 + <PATH_ELEMENT>
  287 + <option name="myItemId" value="shipin" />
  288 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  289 + </PATH_ELEMENT>
  290 + <PATH_ELEMENT>
223 <option name="myItemId" value="css" /> 291 <option name="myItemId" value="css" />
224 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 292 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
225 </PATH_ELEMENT> 293 </PATH_ELEMENT>
  294 + <PATH_ELEMENT>
  295 + <option name="myItemId" value="PersonCenter" />
  296 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  297 + </PATH_ELEMENT>
226 </PATH> 298 </PATH>
227 </subPane> 299 </subPane>
228 </pane> 300 </pane>
@@ -239,6 +311,11 @@ @@ -239,6 +311,11 @@
239 <property name="options.splitter.main.proportions" value="0.3" /> 311 <property name="options.splitter.main.proportions" value="0.3" />
240 <property name="options.splitter.details.proportions" value="0.2" /> 312 <property name="options.splitter.details.proportions" value="0.2" />
241 </component> 313 </component>
  314 + <component name="RecentsManager">
  315 + <key name="CopyFile.RECENT_KEYS">
  316 + <recent name="F:\project\shipin\img" />
  317 + </key>
  318 + </component>
242 <component name="RunManager"> 319 <component name="RunManager">
243 <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit"> 320 <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
244 <method /> 321 <method />
@@ -291,7 +368,7 @@ @@ -291,7 +368,7 @@
291 <servers /> 368 <servers />
292 </component> 369 </component>
293 <component name="ToolWindowManager"> 370 <component name="ToolWindowManager">
294 - <frame x="-7" y="2" width="1932" height="1051" extended-state="1" /> 371 + <frame x="-7" y="2" width="1932" height="1051" extended-state="0" />
295 <editor active="true" /> 372 <editor active="true" />
296 <layout> 373 <layout>
297 <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" /> 374 <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 @@ @@ -300,6 +377,8 @@
300 <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" /> 377 <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" />
301 <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" /> 378 <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" />
302 <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" /> 379 <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" />
  380 + <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" />
  381 + <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" />
303 <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" /> 382 <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" />
304 <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" /> 383 <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" />
305 <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" /> 384 <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 @@ @@ -307,11 +386,9 @@
307 <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" /> 386 <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" />
308 <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" /> 387 <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" />
309 <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" /> 388 <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" />
310 - <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" />  
311 <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" /> 389 <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" />
312 <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" /> 390 <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" />
313 <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" /> 391 <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" />
314 - <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" />  
315 </layout> 392 </layout>
316 </component> 393 </component>
317 <component name="Vcs.Log.UiProperties"> 394 <component name="Vcs.Log.UiProperties">
@@ -356,7 +433,7 @@ @@ -356,7 +433,7 @@
356 <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909"> 433 <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909">
357 <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" /> 434 <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />
358 <folding> 435 <folding>
359 - <element signature="n#!!doc" expanded="true" /> 436 + <element signature="n#!!doc" expanded="false" />
360 </folding> 437 </folding>
361 </state> 438 </state>
362 </provider> 439 </provider>
@@ -389,7 +466,9 @@ @@ -389,7 +466,9 @@
389 <provider selected="true" editor-type-id="text-editor"> 466 <provider selected="true" editor-type-id="text-editor">
390 <state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477"> 467 <state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477">
391 <caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" /> 468 <caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" />
392 - <folding /> 469 + <folding>
  470 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  471 + </folding>
393 </state> 472 </state>
394 </provider> 473 </provider>
395 </entry> 474 </entry>
@@ -437,7 +516,9 @@ @@ -437,7 +516,9 @@
437 <provider selected="true" editor-type-id="text-editor"> 516 <provider selected="true" editor-type-id="text-editor">
438 <state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477"> 517 <state vertical-scroll-proportion="0.0" vertical-offset="2584" max-vertical-offset="3477">
439 <caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" /> 518 <caret line="136" column="43" selection-start-line="136" selection-start-column="43" selection-end-line="136" selection-end-column="43" />
440 - <folding /> 519 + <folding>
  520 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  521 + </folding>
441 </state> 522 </state>
442 </provider> 523 </provider>
443 </entry> 524 </entry>
@@ -487,77 +568,152 @@ @@ -487,77 +568,152 @@
487 </state> 568 </state>
488 </provider> 569 </provider>
489 </entry> 570 </entry>
490 - <entry file="file://$PROJECT_DIR$/js/personcenter.js"> 571 + <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
491 <provider selected="true" editor-type-id="text-editor"> 572 <provider selected="true" editor-type-id="text-editor">
492 - <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">  
493 - <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" /> 573 + <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
  574 + <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
494 <folding /> 575 <folding />
495 </state> 576 </state>
496 </provider> 577 </provider>
497 </entry> 578 </entry>
498 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> 579 + <entry file="file://$PROJECT_DIR$/myorder/myorder.html">
499 <provider selected="true" editor-type-id="text-editor"> 580 <provider selected="true" editor-type-id="text-editor">
500 - <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">  
501 - <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> 581 + <state vertical-scroll-proportion="-28.785715" vertical-offset="0" max-vertical-offset="6058">
  582 + <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
502 <folding /> 583 <folding />
503 </state> 584 </state>
504 </provider> 585 </provider>
505 </entry> 586 </entry>
506 - <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css"> 587 + <entry file="file://$PROJECT_DIR$/js/shopcar.js">
507 <provider selected="true" editor-type-id="text-editor"> 588 <provider selected="true" editor-type-id="text-editor">
508 - <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">  
509 - <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" /> 589 + <state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775">
  590 + <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
  591 + <folding>
  592 + <element signature="n#!!doc" expanded="false" />
  593 + </folding>
  594 + </state>
  595 + </provider>
  596 + </entry>
  597 + <entry file="file://$PROJECT_DIR$/js/addressdetail.js">
  598 + <provider selected="true" editor-type-id="text-editor">
  599 + <state vertical-scroll-proportion="2.08" vertical-offset="546" max-vertical-offset="3718">
  600 + <caret line="19" column="12" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
510 <folding /> 601 <folding />
511 </state> 602 </state>
512 </provider> 603 </provider>
513 </entry> 604 </entry>
514 - <entry file="file://$PROJECT_DIR$/css/index.css"> 605 + <entry file="file://$PROJECT_DIR$/myorder/takedetails.html">
515 <provider selected="true" editor-type-id="text-editor"> 606 <provider selected="true" editor-type-id="text-editor">
516 - <state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840">  
517 - <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" /> 607 + <state vertical-scroll-proportion="-19.464285" vertical-offset="582" max-vertical-offset="2530">
  608 + <caret line="49" column="26" selection-start-line="49" selection-start-column="26" selection-end-line="49" selection-end-column="26" />
518 <folding /> 609 <folding />
519 </state> 610 </state>
520 </provider> 611 </provider>
521 </entry> 612 </entry>
522 - <entry file="file://$PROJECT_DIR$/myorder/myorder.html"> 613 + <entry file="file://$PROJECT_DIR$/take_details.html">
523 <provider selected="true" editor-type-id="text-editor"> 614 <provider selected="true" editor-type-id="text-editor">
524 - <state vertical-scroll-proportion="-28.785715" vertical-offset="0" max-vertical-offset="6058">  
525 - <caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" /> 615 + <state vertical-scroll-proportion="-17.607143" vertical-offset="0" max-vertical-offset="1421">
  616 + <caret line="17" column="16" selection-start-line="12" selection-start-column="7" selection-end-line="17" selection-end-column="16" />
  617 + <folding>
  618 + <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" />
  619 + <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" />
  620 + </folding>
  621 + </state>
  622 + </provider>
  623 + </entry>
  624 + <entry file="file://$PROJECT_DIR$/addressdetails.html">
  625 + <provider selected="true" editor-type-id="text-editor">
  626 + <state vertical-scroll-proportion="-15.214286" vertical-offset="6" max-vertical-offset="1539">
  627 + <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
526 <folding /> 628 <folding />
527 </state> 629 </state>
528 </provider> 630 </provider>
529 </entry> 631 </entry>
530 <entry file="file://$PROJECT_DIR$/js/index.js"> 632 <entry file="file://$PROJECT_DIR$/js/index.js">
531 <provider selected="true" editor-type-id="text-editor"> 633 <provider selected="true" editor-type-id="text-editor">
532 - <state vertical-scroll-proportion="-29.16" vertical-offset="5589" max-vertical-offset="12532">  
533 - <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" /> 634 + <state vertical-scroll-proportion="-10.44" vertical-offset="10191" max-vertical-offset="12532">
  635 + <caret line="422" column="12" selection-start-line="422" selection-start-column="8" selection-end-line="422" selection-end-column="12" />
534 <folding /> 636 <folding />
535 </state> 637 </state>
536 </provider> 638 </provider>
537 </entry> 639 </entry>
538 - <entry file="file://$PROJECT_DIR$/js/shopcar.js"> 640 + <entry file="file://$PROJECT_DIR$/js/takedetails.js">
539 <provider selected="true" editor-type-id="text-editor"> 641 <provider selected="true" editor-type-id="text-editor">
540 - <state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775">  
541 - <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> 642 + <state vertical-scroll-proportion="-16.2" vertical-offset="81" max-vertical-offset="1458">
  643 + <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
  644 + <folding />
  645 + </state>
  646 + </provider>
  647 + </entry>
  648 + <entry file="file://$PROJECT_DIR$/js/personcenter.js">
  649 + <provider selected="true" editor-type-id="text-editor">
  650 + <state vertical-scroll-proportion="-33.44" vertical-offset="1062" max-vertical-offset="2886">
  651 + <caret line="73" column="10" selection-start-line="73" selection-start-column="10" selection-end-line="73" selection-end-column="10" />
  652 + <folding />
  653 + </state>
  654 + </provider>
  655 + </entry>
  656 + <entry file="file://$PROJECT_DIR$/css/PersonCenter/PersonCenter.css">
  657 + <provider selected="true" editor-type-id="text-editor">
  658 + <state vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="5934">
  659 + <caret line="117" column="1" selection-start-line="117" selection-start-column="1" selection-end-line="117" selection-end-column="1" />
  660 + <folding />
  661 + </state>
  662 + </provider>
  663 + </entry>
  664 + <entry file="file://$PROJECT_DIR$/css/index.css">
  665 + <provider selected="true" editor-type-id="text-editor">
  666 + <state vertical-scroll-proportion="0.0" vertical-offset="10746" max-vertical-offset="18225">
  667 + <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />
  668 + <folding />
  669 + </state>
  670 + </provider>
  671 + </entry>
  672 + <entry file="file://$PROJECT_DIR$/index.html">
  673 + <provider selected="true" editor-type-id="text-editor">
  674 + <state vertical-scroll-proportion="-6.775862" vertical-offset="6330" max-vertical-offset="9531">
  675 + <caret line="249" column="67" selection-start-line="249" selection-start-column="67" selection-end-line="249" selection-end-column="67" />
  676 + <folding />
  677 + </state>
  678 + </provider>
  679 + </entry>
  680 + <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
  681 + <provider selected="true" editor-type-id="text-editor">
  682 + <state vertical-scroll-proportion="-10.607142" vertical-offset="2511" max-vertical-offset="4941">
  683 + <caret line="104" column="24" selection-start-line="104" selection-start-column="24" selection-end-line="104" selection-end-column="24" />
542 <folding> 684 <folding>
543 - <element signature="n#!!doc" expanded="true" /> 685 + <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" />
  686 + <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" />
544 </folding> 687 </folding>
545 </state> 688 </state>
546 </provider> 689 </provider>
547 </entry> 690 </entry>
548 - <entry file="file://$PROJECT_DIR$/index.html"> 691 + <entry file="file://$PROJECT_DIR$/css/init.css">
549 <provider selected="true" editor-type-id="text-editor"> 692 <provider selected="true" editor-type-id="text-editor">
550 - <state vertical-scroll-proportion="-16.678572" vertical-offset="4984" max-vertical-offset="8119">  
551 - <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" /> 693 + <state vertical-scroll-proportion="0.0" vertical-offset="639" max-vertical-offset="3575">
  694 + <caret line="48" column="14" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
552 <folding /> 695 <folding />
553 </state> 696 </state>
554 </provider> 697 </provider>
555 </entry> 698 </entry>
556 <entry file="file://$PROJECT_DIR$/shopcar.html"> 699 <entry file="file://$PROJECT_DIR$/shopcar.html">
557 <provider selected="true" editor-type-id="text-editor"> 700 <provider selected="true" editor-type-id="text-editor">
558 - <state vertical-scroll-proportion="-0.14350283" vertical-offset="2260" max-vertical-offset="4941">  
559 - <caret line="79" column="18" selection-start-line="79" selection-start-column="18" selection-end-line="79" selection-end-column="18" />  
560 - <folding /> 701 + <state vertical-scroll-proportion="-14.464286" vertical-offset="1620" max-vertical-offset="4995">
  702 + <caret line="75" column="91" selection-start-line="75" selection-start-column="91" selection-end-line="75" selection-end-column="91" />
  703 + <folding>
  704 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  705 + </folding>
  706 + </state>
  707 + </provider>
  708 + </entry>
  709 + <entry file="file://$PROJECT_DIR$/order.html">
  710 + <provider selected="true" editor-type-id="text-editor">
  711 + <state vertical-scroll-proportion="0.39649123" vertical-offset="13161" max-vertical-offset="21033">
  712 + <caret line="500" column="44" selection-start-line="500" selection-start-column="44" selection-end-line="500" selection-end-column="44" />
  713 + <folding>
  714 + <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" />
  715 + <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" />
  716 + </folding>
561 </state> 717 </state>
562 </provider> 718 </provider>
563 </entry> 719 </entry>
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 } 16 }
17 </style> 17 </style>
18 </head> 18 </head>
19 -  
20 <body> 19 <body>
21 <div class="container" id="personcenter" v-cloak> 20 <div class="container" id="personcenter" v-cloak>
22 <!--遮罩--> 21 <!--遮罩-->
@@ -26,10 +25,30 @@ @@ -26,10 +25,30 @@
26 <p>— 咨询热线 —</p> 25 <p>— 咨询热线 —</p>
27 <span>1540098838</span> 26 <span>1540098838</span>
28 <div class="popup_footer"> 27 <div class="popup_footer">
29 - 立即拨打 28 + <a href="tel:1540098838">立即拨打</a>
30 </div> 29 </div>
31 </div> 30 </div>
32 </div> 31 </div>
  32 + <!--个人中心分享页面-->
  33 + <div class="sharewrap" v-if="shareimg" @click="sharewrap()">
  34 + <!--弹层-->
  35 + <div class="sharepopup">
  36 + <img src="../img/share.png" alt="" style="width:100%"/>
  37 +
  38 + </div>
  39 + <div class="sharetext">
  40 + <img src="../img/sharetext.png" alt=""/>
  41 + </div>
  42 + <div class="sharecontent" @click="righnow()">立即邀请</div>
  43 + </div>
  44 + <div class="rowwrap" v-if="rowshare">
  45 + <!--弹层-->
  46 + <div class="rowpopup" @click="shareorner()" >
  47 + <img src="../img/bg.png" alt="" style="width:100%"/>
  48 +
  49 + </div>
  50 +
  51 + </div>
33 52
34 <!--个人信息--> 53 <!--个人信息-->
35 <div class="person"> 54 <div class="person">
@@ -84,7 +103,7 @@ @@ -84,7 +103,7 @@
84 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" /> 103 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" />
85 <span>购物车</span> 104 <span>购物车</span>
86 </a> 105 </a>
87 - <span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span> 106 + <p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
88 </div> 107 </div>
89 <div class="footer_item footer_active"> 108 <div class="footer_item footer_active">
90 <a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x_57.png" /><span>我的</span></a> 109 <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 @@ @@ -10,10 +10,16 @@
10 <link rel="stylesheet" type="text/css" href="css/index.css" /> 10 <link rel="stylesheet" type="text/css" href="css/index.css" />
11 <script src="js/base.js" type="text/javascript" charset="utf-8"></script> 11 <script src="js/base.js" type="text/javascript" charset="utf-8"></script>
12 <title>门店详情</title> 12 <title>门店详情</title>
  13 + <style>
  14 + [v-cloak]{
  15 + display:none;
  16 + }
  17 +
  18 + </style>
13 </head> 19 </head>
14 20
15 <body> 21 <body>
16 - <div class="container" id="addressdetail"> 22 + <div class="container" id="addressdetail" v-cloak>
17 <div class="add_wrap"> 23 <div class="add_wrap">
18 <div class="add_wrap_text"> 24 <div class="add_wrap_text">
19 <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> 25 <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 @@ @@ -22,6 +28,7 @@
22 </div> 28 </div>
23 <span>场景图片</span> 29 <span>场景图片</span>
24 <div class="address_pic_list" v-html="photo"> 30 <div class="address_pic_list" v-html="photo">
  31 + {{photo}}
25 <!--<img src="img/2@2x.png" />--> 32 <!--<img src="img/2@2x.png" />-->
26 <!--<img src="img/@2x.png" />--> 33 <!--<img src="img/@2x.png" />-->
27 <!--<img src="img/2@2x.png" />--> 34 <!--<img src="img/2@2x.png" />-->
@@ -52,6 +52,70 @@ @@ -52,6 +52,70 @@
52 color: #FFFFFF; 52 color: #FFFFFF;
53 font-size: 0.3rem; 53 font-size: 0.3rem;
54 } 54 }
  55 +/*分享页面弹出层*/
  56 +.sharewrap{
  57 + width: 7.5rem;
  58 + height: 100%;
  59 + background-color:rgba(0,0,0,0.5);
  60 + position: fixed;
  61 + z-index: 2;
  62 + margin-left: -0.4rem;
  63 + /*display: none;*/
  64 +}
  65 +.sharepopup{
  66 + width: 5.48rem;
  67 + /**/
  68 + position: absolute;
  69 + z-index: 3;
  70 + /*background-color: #FFFFFF;*/
  71 + left: 1rem;
  72 + top: 2.5rem;
  73 + display: flex;
  74 + flex-direction: column;
  75 + align-items: center;
  76 + border-radius: 0.15rem;
  77 + overflow: hidden;
  78 +}
  79 +.sharetext{
  80 + width:3.48rem;
  81 + position: absolute;
  82 + z-index: 3;
  83 + /*background-color: #FFFFFF;*/
  84 + left: 2rem;
  85 + top: 7.8rem;
  86 + display: flex;
  87 + flex-direction: column;
  88 + align-items: center;
  89 + border-radius: 0.15rem;
  90 + overflow: hidden;
  91 +}
  92 +.sharecontent{
  93 + position: absolute;
  94 + z-index: 3;
  95 + font-size: 0.36rem;
  96 + color:#D43D31;
  97 + left: 3rem;
  98 + top: 7.85rem;
  99 +}
  100 +.rowwrap{
  101 + width: 7.5rem;
  102 + height: 100%;
  103 + background-color:rgba(0,0,0,0.5);
  104 + position: fixed;
  105 + z-index: 2;
  106 + margin-left: -0.4rem;
  107 + /*display:none;*/
  108 +}
  109 +.rowpopup {
  110 + width: 7.5rem;
  111 + height: 100%;
  112 + position: absolute;
  113 + z-index: 3;
  114 + display: flex;
  115 + flex-direction: column;
  116 + align-items: center;
  117 + overflow: hidden;
  118 +}
55 /*个人信息*/ 119 /*个人信息*/
56 .person_info{ 120 .person_info{
57 display: flex; 121 display: flex;
@@ -440,6 +440,7 @@ @@ -440,6 +440,7 @@
440 440
441 .footer_item span { 441 .footer_item span {
442 color: #999999; 442 color: #999999;
  443 +
443 } 444 }
444 445
445 .footer_item img { 446 .footer_item img {
@@ -47,6 +47,7 @@ body { @@ -47,6 +47,7 @@ body {
47 height: 100%; 47 height: 100%;
48 padding: 0; 48 padding: 0;
49 margin: 0; 49 margin: 0;
  50 + /*overflow: hidden;*/
50 background-color: RGBA(245, 246, 250, 1); 51 background-color: RGBA(245, 246, 250, 1);
51 } 52 }
52 53

30.2 KB
@@ -247,7 +247,7 @@ @@ -247,7 +247,7 @@
247 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" /> 247 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" />
248 <span>购物车</span> 248 <span>购物车</span>
249 </a> 249 </a>
250 - <span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span> 250 + <p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
251 </div> 251 </div>
252 <div class="footer_item"> 252 <div class="footer_item">
253 <a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x.png" /><span>我的</span></a> 253 <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({ @@ -4,7 +4,9 @@ new Vue({
4 data: { 4 data: {
5 persontype:[], 5 persontype:[],
6 personinfo:[], 6 personinfo:[],
7 - cartnum:0 7 + cartnum:0,
  8 + shareimg:false,
  9 + rowshare:false
8 10
9 }, 11 },
10 created: function() { 12 created: function() {
@@ -47,6 +49,29 @@ new Vue({ @@ -47,6 +49,29 @@ new Vue({
47 console.log(that.cartnum); 49 console.log(that.cartnum);
48 }) 50 })
49 }, 51 },
  52 + //分享页面
  53 + share:function(){
  54 + var that=this;
  55 + that.shareimg=true;
  56 + },
  57 + sharewrap:function(){
  58 + var that=this;
  59 + that.shareimg=false;
  60 +
  61 + },
  62 + //立即邀请
  63 + righnow:function(){
  64 + var that=this;
  65 + that.shareimg=false;
  66 + that.rowshare=true;
  67 + },
  68 +
  69 + shareorner:function(){
  70 +
  71 + var that=this;
  72 + that.rowshare=false;
  73 +
  74 + },
50 //关于我们 75 //关于我们
51 aboutus:function(){ 76 aboutus:function(){
52 window.location.href=linkPath+'/about.html' 77 window.location.href=linkPath+'/about.html'
@@ -11,9 +11,9 @@ new Vue({ @@ -11,9 +11,9 @@ new Vue({
11 data: { 11 data: {
12 //详细地址 12 //详细地址
13 spotdetail: { 13 spotdetail: {
14 - photo: "",  
15 - spot_detail_address: "",  
16 - }, 14 + //photo: "",
  15 + //spot_detail_address: ""
  16 + }
17 17
18 }, 18 },
19 created: function() { 19 created: function() {
@@ -26,22 +26,23 @@ new Vue({ @@ -26,22 +26,23 @@ new Vue({
26 var that = this; 26 var that = this;
27 var url = '/Spot/detail' 27 var url = '/Spot/detail'
28 var params = { 28 var params = {
29 - id: spotid, 29 + id: spotid
30 } 30 }
31 ajaxsend(url, params, function(res) { 31 ajaxsend(url, params, function(res) {
32 /*console.log(JSON.stringify(res))*/ 32 /*console.log(JSON.stringify(res))*/
33 console.log(res); 33 console.log(res);
34 var data=res.data; 34 var data=res.data;
35 - that.spotdetail.spot_detail_address=data.spot_detail_address;  
36 - var photo=data.photo;  
37 - photo=JSON.stringify(photo);  
38 - that.spotdetail.photo=photo;  
39 - console.log(that.spotdetail.photo); 35 + that.spotdetail=data;
  36 + //that.spotdetail.spot_detail_address=data.spot_detail_address;
  37 + //var photo=data.photo;
  38 + // photo=JSON.stringify(photo);
  39 + //that.spotdetail.photo=photo;
  40 + //console.log(that.spotdetail.photo);
40 }) 41 })
41 - }, 42 + }
42 43
43 44
44 - }, 45 + }
45 46
46 }) 47 })
47 48
@@ -507,7 +507,7 @@ @@ -507,7 +507,7 @@
507 507
508 <div class="weui-cell"> 508 <div class="weui-cell">
509 <div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div> 509 <div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div>
510 - <div class="weui-cell__bd" style="margin-left: 47px;font-size: 0.3rem;color:#333333"> 510 + <div class="weui-cell__bd" style="margin-left:0.4rem;font-size: 0.3rem;color:#333333">
511 <input class="weui-input" id="time4" type="text" value=""> 511 <input class="weui-input" id="time4" type="text" value="">
512 </div> 512 </div>
513 </div> 513 </div>
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> 6 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" /> 7 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/swiper-3.4.2.min.css" />
8 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/init.css" /> 8 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/init.css" />
9 - <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_647640_to180rktm1butyb9.css" /> 9 + <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_647640_l5rjgpoksoj62yb9.css"/>
10 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/weui.css" /> 10 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/weui.css" />
11 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/example.css" /> 11 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/example.css" />
12 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/shopcar.css" /> 12 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/shopcar.css" />
@@ -55,12 +55,14 @@ @@ -55,12 +55,14 @@
55 text-align: center; 55 text-align: center;
56 line-height: 0.36rem; 56 line-height: 0.36rem;
57 } 57 }
58 - 58 + #unstock{
  59 + line-height: 2rem;
  60 + }
59 </style> 61 </style>
60 </head> 62 </head>
61 63
62 <body onload="load()"> 64 <body onload="load()">
63 - <div class="container" style="overflow-x: hidden;" id="shopcar"> 65 + <div class="container" style="overflow-x: hidden;padding-bottom: 2rem" id="shopcar">
64 <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"> 66 <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">
65 <input type="checkbox" class="choose" :checked="item.checked" name="" id="" value="" @click="check(item,index)"/> 67 <input type="checkbox" class="choose" :checked="item.checked" name="" id="" value="" @click="check(item,index)"/>
66 <img v-bind:src="item.thumb" /> 68 <img v-bind:src="item.thumb" />
@@ -115,7 +117,7 @@ @@ -115,7 +117,7 @@
115 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x_55.png" /> 117 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x_55.png" />
116 <span>购物车</span> 118 <span>购物车</span>
117 </a> 119 </a>
118 - <span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span> 120 + <p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
119 </div> 121 </div>
120 <div class="footer_item"> 122 <div class="footer_item">
121 <a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x.png" /><span>我的</span></a> 123 <a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x.png" /><span>我的</span></a>
@@ -10,10 +10,16 @@ @@ -10,10 +10,16 @@
10 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/index.css" /> 10 <link rel="stylesheet" type="text/css" href="/themes/simplebootx/Portal/Template/css/index.css" />
11 <script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script> 11 <script src="/themes/simplebootx/Portal/Template/js/base.js" type="text/javascript" charset="utf-8"></script>
12 <title>门店详情</title> 12 <title>门店详情</title>
  13 + <style>
  14 + [v-cloak]{
  15 + display:none;
  16 + }
  17 +
  18 + </style>
13 </head> 19 </head>
14 20
15 <body> 21 <body>
16 - <div class="container" id="spotdetail"> 22 + <div class="container" id="spotdetail" v-cloak>
17 23
18 <div class="add_wrap"> 24 <div class="add_wrap">
19 <div class="add_wrap_text"> 25 <div class="add_wrap_text">
@@ -22,6 +28,7 @@ @@ -22,6 +28,7 @@
22 </div> 28 </div>
23 <span>场景图片</span> 29 <span>场景图片</span>
24 <div class="address_pic_list" v-html="spotdetail.photo"> 30 <div class="address_pic_list" v-html="spotdetail.photo">
  31 + {{spotdetail.photo}}
25 </div> 32 </div>
26 </div> 33 </div>
27 </div> 34 </div>