李涵 / shipin · 提交

转到一个项目

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

合并分支 'lihongjuan' 到 'master' 

修改



查看合并请求 !8
内嵌 并排对比
正在显示 17 个修改的文件 包含 607 行增加 和 135 行删除
@@ -27,100 +27,125 @@ @@ -27,100 +27,125 @@
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" />  
32 - <folding /> 30 + <state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
  31 + <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
  32 + <folding>
  33 + <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  34 + </folding>
33 </state> 35 </state>
34 </provider> 36 </provider>
35 </entry> 37 </entry>
36 </file> 38 </file>
37 - <file leaf-file-name="index.js" pinned="false" current-in-tab="false">  
38 - <entry file="file://$PROJECT_DIR$/js/index.js"> 39 + <file leaf-file-name="order.js" pinned="false" current-in-tab="false">
  40 + <entry file="file://$PROJECT_DIR$/js/order.js">
39 <provider selected="true" editor-type-id="text-editor"> 41 <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" /> 42 + <state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
  43 + <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
42 <folding /> 44 <folding />
43 </state> 45 </state>
44 </provider> 46 </provider>
45 </entry> 47 </entry>
46 </file> 48 </file>
47 - <file leaf-file-name="shopcar.js" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/js/shopcar.js"> 49 + <file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="true">
  50 + <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
49 <provider selected="true" editor-type-id="text-editor"> 51 <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" /> 52 + <state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
  53 + <caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
52 <folding> 54 <folding>
53 - <element signature="n#!!doc" expanded="true" /> 55 + <element signature="e#433#1880#2" expanded="true" />
  56 + <element signature="e#23094#23349#2" expanded="true" />
  57 + <element signature="e#23872#25319#2" expanded="true" />
  58 + <element signature="e#43380#43644#2" expanded="true" />
  59 + <element signature="e#43689#43958#2" expanded="true" />
  60 + <element signature="e#47051#47309#2" expanded="true" />
  61 + <element signature="e#47473#47731#2" expanded="true" />
  62 + <element signature="e#47862#48120#2" expanded="true" />
  63 + <element signature="e#48211#48469#2" expanded="true" />
  64 + <element signature="e#48633#48891#2" expanded="true" />
  65 + <element signature="e#49022#49280#2" expanded="true" />
  66 + <element signature="e#58869#60316#2" expanded="true" />
  67 + <element signature="e#60470#61914#2" expanded="true" />
54 </folding> 68 </folding>
55 </state> 69 </state>
56 </provider> 70 </provider>
57 </entry> 71 </entry>
58 </file> 72 </file>
59 - <file leaf-file-name="myorder.html" pinned="false" current-in-tab="false">  
60 - <entry file="file://$PROJECT_DIR$/myorder/myorder.html"> 73 + <file leaf-file-name="hopeaddress.js" pinned="false" current-in-tab="false">
  74 + <entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
61 <provider selected="true" editor-type-id="text-editor"> 75 <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" /> 76 + <state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
  77 + <caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
64 <folding /> 78 <folding />
65 </state> 79 </state>
66 </provider> 80 </provider>
67 </entry> 81 </entry>
68 </file> 82 </file>
69 - <file leaf-file-name="index.css" pinned="false" current-in-tab="false">  
70 - <entry file="file://$PROJECT_DIR$/css/index.css"> 83 + <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
  84 + <entry file="file://$PROJECT_DIR$/shopcar.html">
71 <provider selected="true" editor-type-id="text-editor"> 85 <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" /> 86 + <state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
  87 + <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
74 <folding /> 88 <folding />
75 </state> 89 </state>
76 </provider> 90 </provider>
77 </entry> 91 </entry>
78 </file> 92 </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"> 93 + <file leaf-file-name="research.js" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/js/research.js">
81 <provider selected="true" editor-type-id="text-editor"> 95 <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" /> 96 + <state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
  97 + <caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
84 <folding /> 98 <folding />
85 </state> 99 </state>
86 </provider> 100 </provider>
87 </entry> 101 </entry>
88 </file> 102 </file>
89 - <file leaf-file-name="shopcar.html" pinned="false" current-in-tab="true">  
90 - <entry file="file://$PROJECT_DIR$/shopcar.html"> 103 + <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
  104 + <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
91 <provider selected="true" editor-type-id="text-editor"> 105 <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" /> 106 + <state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
  107 + <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
94 <folding /> 108 <folding />
95 </state> 109 </state>
96 </provider> 110 </provider>
97 </entry> 111 </entry>
98 </file> 112 </file>
99 - <file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">  
100 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html"> 113 + <file leaf-file-name="research.html" pinned="false" current-in-tab="false">
  114 + <entry file="file://$PROJECT_DIR$/research.html">
101 <provider selected="true" editor-type-id="text-editor"> 115 <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" />  
104 - <folding /> 116 + <state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
  117 + <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
  118 + <folding>
  119 + <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" />
  120 + <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" />
  121 + <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" />
  122 + <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" />
  123 + <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" />
  124 + <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" />
  125 + <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" />
  126 + <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" />
  127 + </folding>
105 </state> 128 </state>
106 </provider> 129 </provider>
107 </entry> 130 </entry>
108 </file> 131 </file>
109 - <file leaf-file-name="personcenter.js" pinned="false" current-in-tab="false">  
110 - <entry file="file://$PROJECT_DIR$/js/personcenter.js"> 132 + <file leaf-file-name="evalute.js" pinned="false" current-in-tab="false">
  133 + <entry file="file://$PROJECT_DIR$/js/evalute.js">
111 <provider selected="true" editor-type-id="text-editor"> 134 <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" />  
114 - <folding /> 135 + <state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
  136 + <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
  137 + <folding>
  138 + <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
  139 + </folding>
115 </state> 140 </state>
116 </provider> 141 </provider>
117 </entry> 142 </entry>
118 </file> 143 </file>
119 - <file leaf-file-name="cookie.js" pinned="false" current-in-tab="false">  
120 - <entry file="file://$PROJECT_DIR$/js/cookie.js"> 144 + <file leaf-file-name="research.css" pinned="false" current-in-tab="false">
  145 + <entry file="file://$PROJECT_DIR$/css/research.css">
121 <provider selected="true" editor-type-id="text-editor"> 146 <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" /> 147 + <state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">
  148 + <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
124 <folding /> 149 <folding />
125 </state> 150 </state>
126 </provider> 151 </provider>
@@ -132,16 +157,25 @@ @@ -132,16 +157,25 @@
132 <option name="CHANGED_PATHS"> 157 <option name="CHANGED_PATHS">
133 <list> 158 <list>
134 <option value="$PROJECT_DIR$/js/base.js" /> 159 <option value="$PROJECT_DIR$/js/base.js" />
135 - <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />  
136 <option value="$PROJECT_DIR$/js/cookie.js" /> 160 <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" /> 161 <option value="$PROJECT_DIR$/css/swiper-3.4.2.min.css" />
139 <option value="$PROJECT_DIR$/css/index.css" /> 162 <option value="$PROJECT_DIR$/css/index.css" />
140 <option value="$PROJECT_DIR$/myorder/myorder.html" /> 163 <option value="$PROJECT_DIR$/myorder/myorder.html" />
141 <option value="$PROJECT_DIR$/js/index.js" /> 164 <option value="$PROJECT_DIR$/js/index.js" />
142 <option value="$PROJECT_DIR$/js/shopcar.js" /> 165 <option value="$PROJECT_DIR$/js/shopcar.js" />
143 - <option value="$PROJECT_DIR$/index.html" /> 166 + <option value="$PROJECT_DIR$/js/personcenter.js" />
  167 + <option value="$PROJECT_DIR$/order.html" />
  168 + <option value="$PROJECT_DIR$/hopeaddress.html" />
  169 + <option value="$PROJECT_DIR$/js/hopeaddress.js" />
  170 + <option value="$PROJECT_DIR$/js/research.js" />
  171 + <option value="$PROJECT_DIR$/css/research.css" />
  172 + <option value="$PROJECT_DIR$/research.html" />
  173 + <option value="$PROJECT_DIR$/js/evalute.js" />
144 <option value="$PROJECT_DIR$/shopcar.html" /> 174 <option value="$PROJECT_DIR$/shopcar.html" />
  175 + <option value="$PROJECT_DIR$/PersonCenter/PersonCenter.html" />
  176 + <option value="$PROJECT_DIR$/index.html" />
  177 + <option value="$PROJECT_DIR$/js/order.js" />
  178 + <option value="$PROJECT_DIR$/css/jquery-weui.css" />
145 </list> 179 </list>
146 </option> 180 </option>
147 </component> 181 </component>
@@ -177,7 +211,6 @@ @@ -177,7 +211,6 @@
177 <sortByType /> 211 <sortByType />
178 </navigator> 212 </navigator>
179 <panes> 213 <panes>
180 - <pane id="Scope" />  
181 <pane id="ProjectPane"> 214 <pane id="ProjectPane">
182 <subPane> 215 <subPane>
183 <PATH> 216 <PATH>
@@ -206,6 +239,20 @@ @@ -206,6 +239,20 @@
206 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 239 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
207 </PATH_ELEMENT> 240 </PATH_ELEMENT>
208 <PATH_ELEMENT> 241 <PATH_ELEMENT>
  242 + <option name="myItemId" value="PersonCenter" />
  243 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  244 + </PATH_ELEMENT>
  245 + </PATH>
  246 + <PATH>
  247 + <PATH_ELEMENT>
  248 + <option name="myItemId" value="TakeFood" />
  249 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  250 + </PATH_ELEMENT>
  251 + <PATH_ELEMENT>
  252 + <option name="myItemId" value="shipin" />
  253 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  254 + </PATH_ELEMENT>
  255 + <PATH_ELEMENT>
209 <option name="myItemId" value="myorder" /> 256 <option name="myItemId" value="myorder" />
210 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 257 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
211 </PATH_ELEMENT> 258 </PATH_ELEMENT>
@@ -220,17 +267,32 @@ @@ -220,17 +267,32 @@
220 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 267 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
221 </PATH_ELEMENT> 268 </PATH_ELEMENT>
222 <PATH_ELEMENT> 269 <PATH_ELEMENT>
  270 + <option name="myItemId" value="js" />
  271 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  272 + </PATH_ELEMENT>
  273 + </PATH>
  274 + <PATH>
  275 + <PATH_ELEMENT>
  276 + <option name="myItemId" value="TakeFood" />
  277 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  278 + </PATH_ELEMENT>
  279 + <PATH_ELEMENT>
  280 + <option name="myItemId" value="shipin" />
  281 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  282 + </PATH_ELEMENT>
  283 + <PATH_ELEMENT>
223 <option name="myItemId" value="css" /> 284 <option name="myItemId" value="css" />
224 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 285 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
225 </PATH_ELEMENT> 286 </PATH_ELEMENT>
226 </PATH> 287 </PATH>
227 </subPane> 288 </subPane>
228 </pane> 289 </pane>
  290 + <pane id="Scope" />
229 </panes> 291 </panes>
230 </component> 292 </component>
231 <component name="PropertiesComponent"> 293 <component name="PropertiesComponent">
232 <property name="WebServerToolWindowFactoryState" value="false" /> 294 <property name="WebServerToolWindowFactoryState" value="false" />
233 - <property name="last_opened_file_path" value="$USER_HOME$/Desktop/新建文件夹 (4)" /> 295 + <property name="last_opened_file_path" value="G:/project" />
234 <property name="HbShouldOpenHtmlAsHb" value="" /> 296 <property name="HbShouldOpenHtmlAsHb" value="" />
235 <property name="JavaScriptLanguageLevel" value="ES6" /> 297 <property name="JavaScriptLanguageLevel" value="ES6" />
236 <property name="JavaScriptPreferStrict" value="false" /> 298 <property name="JavaScriptPreferStrict" value="false" />
@@ -239,11 +301,20 @@ @@ -239,11 +301,20 @@
239 <property name="options.splitter.main.proportions" value="0.3" /> 301 <property name="options.splitter.main.proportions" value="0.3" />
240 <property name="options.splitter.details.proportions" value="0.2" /> 302 <property name="options.splitter.details.proportions" value="0.2" />
241 </component> 303 </component>
  304 + <component name="RecentsManager">
  305 + <key name="CopyFile.RECENT_KEYS">
  306 + <recent name="D:\项目\shipin\img" />
  307 + </key>
  308 + </component>
242 <component name="RunManager"> 309 <component name="RunManager">
  310 + <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
  311 + <method />
  312 + </configuration>
243 <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit"> 313 <configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
244 <method /> 314 <method />
245 </configuration> 315 </configuration>
246 - <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application"> 316 + <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
  317 + <envs />
247 <method /> 318 <method />
248 </configuration> 319 </configuration>
249 <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver"> 320 <configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
@@ -253,10 +324,6 @@ @@ -253,10 +324,6 @@
253 <setting name="preferredDebugBrowser" value="Chrome" /> 324 <setting name="preferredDebugBrowser" value="Chrome" />
254 <method /> 325 <method />
255 </configuration> 326 </configuration>
256 - <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">  
257 - <envs />  
258 - <method />  
259 - </configuration>  
260 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> 327 <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
261 <method /> 328 <method />
262 </configuration> 329 </configuration>
@@ -292,7 +359,7 @@ @@ -292,7 +359,7 @@
292 </component> 359 </component>
293 <component name="ToolWindowManager"> 360 <component name="ToolWindowManager">
294 <frame x="-7" y="2" width="1932" height="1051" extended-state="1" /> 361 <frame x="-7" y="2" width="1932" height="1051" extended-state="1" />
295 - <editor active="true" /> 362 + <editor active="false" />
296 <layout> 363 <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" /> 364 <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" />
298 <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" /> 365 <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 @@ @@ -300,18 +367,18 @@
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" /> 367 <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" /> 368 <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" /> 369 <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" />
  370 + <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" />
  371 + <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" /> 372 <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" /> 373 <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" /> 374 <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" />
306 <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" /> 375 <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" />
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" /> 376 <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" />  
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" /> 377 <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" /> 378 + <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" />
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" /> 379 <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" />  
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" /> 380 <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" /> 381 + <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" />
315 </layout> 382 </layout>
316 </component> 383 </component>
317 <component name="Vcs.Log.UiProperties"> 384 <component name="Vcs.Log.UiProperties">
@@ -337,9 +404,102 @@ @@ -337,9 +404,102 @@
337 <component name="editorHistoryManager"> 404 <component name="editorHistoryManager">
338 <entry file="file://$PROJECT_DIR$/index.html"> 405 <entry file="file://$PROJECT_DIR$/index.html">
339 <provider selected="true" editor-type-id="text-editor"> 406 <provider selected="true" editor-type-id="text-editor">
  407 + <state vertical-scroll-proportion="0.0" vertical-offset="4503" max-vertical-offset="6688">
  408 + <caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
  409 + <folding>
  410 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  411 + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  412 + <element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  413 + </folding>
  414 + </state>
  415 + </provider>
  416 + </entry>
  417 + <entry file="file://$PROJECT_DIR$/js/index.js">
  418 + <provider selected="true" editor-type-id="text-editor">
  419 + <state vertical-scroll-proportion="0.0" vertical-offset="4617" max-vertical-offset="9158">
  420 + <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />
  421 + <folding />
  422 + </state>
  423 + </provider>
  424 + </entry>
  425 + <entry file="file://$PROJECT_DIR$/js/shopcar.js">
  426 + <provider selected="true" editor-type-id="text-editor">
  427 + <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
  428 + <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
  429 + <folding>
  430 + <element signature="n#!!doc" expanded="false" />
  431 + </folding>
  432 + </state>
  433 + </provider>
  434 + </entry>
  435 + <entry file="file://$PROJECT_DIR$/myorder/myorder.html">
  436 + <provider selected="true" editor-type-id="text-editor">
  437 + <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
  438 + <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
  439 + <folding />
  440 + </state>
  441 + </provider>
  442 + </entry>
  443 + <entry file="file://$PROJECT_DIR$/css/index.css">
  444 + <provider selected="true" editor-type-id="text-editor">
  445 + <state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">
  446 + <caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
  447 + <folding />
  448 + </state>
  449 + </provider>
  450 + </entry>
  451 + <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
  452 + <provider selected="true" editor-type-id="text-editor">
  453 + <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
  454 + <caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
  455 + <folding />
  456 + </state>
  457 + </provider>
  458 + </entry>
  459 + <entry file="file://$PROJECT_DIR$/shopcar.html">
  460 + <provider selected="true" editor-type-id="text-editor">
  461 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3477">
  462 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  463 + <folding />
  464 + </state>
  465 + </provider>
  466 + </entry>
  467 + <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
  468 + <provider selected="true" editor-type-id="text-editor">
  469 + <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211">
  470 + <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
  471 + <folding>
  472 + <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" />
  473 + <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" />
  474 + </folding>
  475 + </state>
  476 + </provider>
  477 + </entry>
  478 + <entry file="file://$PROJECT_DIR$/js/personcenter.js">
  479 + <provider selected="true" editor-type-id="text-editor">
  480 + <state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
  481 + <caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
  482 + <folding />
  483 + </state>
  484 + </provider>
  485 + </entry>
  486 + <entry file="file://$PROJECT_DIR$/js/cookie.js">
  487 + <provider selected="true" editor-type-id="text-editor">
  488 + <state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
  489 + <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
  490 + <folding />
  491 + </state>
  492 + </provider>
  493 + </entry>
  494 + <entry file="file://$PROJECT_DIR$/index.html">
  495 + <provider selected="true" editor-type-id="text-editor">
340 <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707"> 496 <state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707">
341 <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" /> 497 <caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" />
342 - <folding /> 498 + <folding>
  499 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  500 + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  501 + <element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  502 + </folding>
343 </state> 503 </state>
344 </provider> 504 </provider>
345 </entry> 505 </entry>
@@ -356,7 +516,7 @@ @@ -356,7 +516,7 @@
356 <state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909"> 516 <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" /> 517 <caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />
358 <folding> 518 <folding>
359 - <element signature="n#!!doc" expanded="true" /> 519 + <element signature="n#!!doc" expanded="false" />
360 </folding> 520 </folding>
361 </state> 521 </state>
362 </provider> 522 </provider>
@@ -397,7 +557,10 @@ @@ -397,7 +557,10 @@
397 <provider selected="true" editor-type-id="text-editor"> 557 <provider selected="true" editor-type-id="text-editor">
398 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> 558 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
399 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> 559 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
400 - <folding /> 560 + <folding>
  561 + <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" />
  562 + <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" />
  563 + </folding>
401 </state> 564 </state>
402 </provider> 565 </provider>
403 </entry> 566 </entry>
@@ -421,7 +584,11 @@ @@ -421,7 +584,11 @@
421 <provider selected="true" editor-type-id="text-editor"> 584 <provider selected="true" editor-type-id="text-editor">
422 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707"> 585 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707">
423 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 586 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
424 - <folding /> 587 + <folding>
  588 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  589 + <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  590 + <element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
  591 + </folding>
425 </state> 592 </state>
426 </provider> 593 </provider>
427 </entry> 594 </entry>
@@ -445,7 +612,10 @@ @@ -445,7 +612,10 @@
445 <provider selected="true" editor-type-id="text-editor"> 612 <provider selected="true" editor-type-id="text-editor">
446 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116"> 613 <state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
447 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" /> 614 <caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
448 - <folding /> 615 + <folding>
  616 + <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" />
  617 + <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" />
  618 + </folding>
449 </state> 619 </state>
450 </provider> 620 </provider>
451 </entry> 621 </entry>
@@ -487,22 +657,6 @@ @@ -487,22 +657,6 @@
487 </state> 657 </state>
488 </provider> 658 </provider>
489 </entry> 659 </entry>
490 - <entry file="file://$PROJECT_DIR$/js/personcenter.js">  
491 - <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" />  
494 - <folding />  
495 - </state>  
496 - </provider>  
497 - </entry>  
498 - <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">  
499 - <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" />  
502 - <folding />  
503 - </state>  
504 - </provider>  
505 - </entry>  
506 <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css"> 660 <entry file="file://$PROJECT_DIR$/css/swiper-3.4.2.min.css">
507 <provider selected="true" editor-type-id="text-editor"> 661 <provider selected="true" editor-type-id="text-editor">
508 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380"> 662 <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
@@ -521,15 +675,15 @@ @@ -521,15 +675,15 @@
521 </entry> 675 </entry>
522 <entry file="file://$PROJECT_DIR$/myorder/myorder.html"> 676 <entry file="file://$PROJECT_DIR$/myorder/myorder.html">
523 <provider selected="true" editor-type-id="text-editor"> 677 <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" /> 678 + <state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
  679 + <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
526 <folding /> 680 <folding />
527 </state> 681 </state>
528 </provider> 682 </provider>
529 </entry> 683 </entry>
530 <entry file="file://$PROJECT_DIR$/js/index.js"> 684 <entry file="file://$PROJECT_DIR$/js/index.js">
531 <provider selected="true" editor-type-id="text-editor"> 685 <provider selected="true" editor-type-id="text-editor">
532 - <state vertical-scroll-proportion="-29.16" vertical-offset="5589" max-vertical-offset="12532"> 686 + <state vertical-scroll-proportion="0.0" vertical-offset="4617" max-vertical-offset="9158">
533 <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" /> 687 <caret line="263" column="17" selection-start-line="263" selection-start-column="17" selection-end-line="263" selection-end-column="17" />
534 <folding /> 688 <folding />
535 </state> 689 </state>
@@ -537,29 +691,160 @@ @@ -537,29 +691,160 @@
537 </entry> 691 </entry>
538 <entry file="file://$PROJECT_DIR$/js/shopcar.js"> 692 <entry file="file://$PROJECT_DIR$/js/shopcar.js">
539 <provider selected="true" editor-type-id="text-editor"> 693 <provider selected="true" editor-type-id="text-editor">
540 - <state vertical-scroll-proportion="-16.88" vertical-offset="1003" max-vertical-offset="7775"> 694 + <state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
541 <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" /> 695 <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
542 <folding> 696 <folding>
543 - <element signature="n#!!doc" expanded="true" /> 697 + <element signature="n#!!doc" expanded="false" />
544 </folding> 698 </folding>
545 </state> 699 </state>
546 </provider> 700 </provider>
547 </entry> 701 </entry>
548 - <entry file="file://$PROJECT_DIR$/index.html"> 702 + <entry file="file://$PROJECT_DIR$/js/personcenter.js">
549 <provider selected="true" editor-type-id="text-editor"> 703 <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" /> 704 + <state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398">
  705 + <caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />
  706 + <folding />
  707 + </state>
  708 + </provider>
  709 + </entry>
  710 + <entry file="file://$PROJECT_DIR$/order.html">
  711 + <provider selected="true" editor-type-id="text-editor">
  712 + <state vertical-scroll-proportion="-15.785714" vertical-offset="7748" max-vertical-offset="20306">
  713 + <caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" />
  714 + <folding />
  715 + </state>
  716 + </provider>
  717 + </entry>
  718 + <entry file="file://$PROJECT_DIR$/hopeaddress.html">
  719 + <provider selected="true" editor-type-id="text-editor">
  720 + <state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457">
  721 + <caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
  722 + <folding />
  723 + </state>
  724 + </provider>
  725 + </entry>
  726 + <entry file="file://$PROJECT_DIR$/share.html">
  727 + <provider selected="true" editor-type-id="text-editor">
  728 + <state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219">
  729 + <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
  730 + <folding />
  731 + </state>
  732 + </provider>
  733 + </entry>
  734 + <entry file="file://$PROJECT_DIR$/about.html">
  735 + <provider selected="true" editor-type-id="text-editor">
  736 + <state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325">
  737 + <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
  738 + <folding />
  739 + </state>
  740 + </provider>
  741 + </entry>
  742 + <entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
  743 + <provider selected="true" editor-type-id="text-editor">
  744 + <state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
  745 + <caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
  746 + <folding />
  747 + </state>
  748 + </provider>
  749 + </entry>
  750 + <entry file="file://$PROJECT_DIR$/js/research.js">
  751 + <provider selected="true" editor-type-id="text-editor">
  752 + <state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
  753 + <caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
  754 + <folding />
  755 + </state>
  756 + </provider>
  757 + </entry>
  758 + <entry file="file://$PROJECT_DIR$/css/research.css">
  759 + <provider selected="true" editor-type-id="text-editor">
  760 + <state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">
  761 + <caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
  762 + <folding />
  763 + </state>
  764 + </provider>
  765 + </entry>
  766 + <entry file="file://$PROJECT_DIR$/research.html">
  767 + <provider selected="true" editor-type-id="text-editor">
  768 + <state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
  769 + <caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
  770 + <folding>
  771 + <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" />
  772 + <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" />
  773 + <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" />
  774 + <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" />
  775 + <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" />
  776 + <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" />
  777 + <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" />
  778 + <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" />
  779 + </folding>
  780 + </state>
  781 + </provider>
  782 + </entry>
  783 + <entry file="file://$PROJECT_DIR$/js/evalute.js">
  784 + <provider selected="true" editor-type-id="text-editor">
  785 + <state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
  786 + <caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
  787 + <folding>
  788 + <marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
  789 + </folding>
  790 + </state>
  791 + </provider>
  792 + </entry>
  793 + <entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
  794 + <provider selected="true" editor-type-id="text-editor">
  795 + <state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
  796 + <caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
552 <folding /> 797 <folding />
553 </state> 798 </state>
554 </provider> 799 </provider>
555 </entry> 800 </entry>
556 <entry file="file://$PROJECT_DIR$/shopcar.html"> 801 <entry file="file://$PROJECT_DIR$/shopcar.html">
557 <provider selected="true" editor-type-id="text-editor"> 802 <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" /> 803 + <state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
  804 + <caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
560 <folding /> 805 <folding />
561 </state> 806 </state>
562 </provider> 807 </provider>
563 </entry> 808 </entry>
  809 + <entry file="file://$PROJECT_DIR$/index.html">
  810 + <provider selected="true" editor-type-id="text-editor">
  811 + <state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
  812 + <caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
  813 + <folding>
  814 + <element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  815 + </folding>
  816 + </state>
  817 + </provider>
  818 + </entry>
  819 + <entry file="file://$PROJECT_DIR$/js/order.js">
  820 + <provider selected="true" editor-type-id="text-editor">
  821 + <state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
  822 + <caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
  823 + <folding />
  824 + </state>
  825 + </provider>
  826 + </entry>
  827 + <entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
  828 + <provider selected="true" editor-type-id="text-editor">
  829 + <state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
  830 + <caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
  831 + <folding>
  832 + <element signature="e#433#1880#2" expanded="true" />
  833 + <element signature="e#23094#23349#2" expanded="true" />
  834 + <element signature="e#23872#25319#2" expanded="true" />
  835 + <element signature="e#43380#43644#2" expanded="true" />
  836 + <element signature="e#43689#43958#2" expanded="true" />
  837 + <element signature="e#47051#47309#2" expanded="true" />
  838 + <element signature="e#47473#47731#2" expanded="true" />
  839 + <element signature="e#47862#48120#2" expanded="true" />
  840 + <element signature="e#48211#48469#2" expanded="true" />
  841 + <element signature="e#48633#48891#2" expanded="true" />
  842 + <element signature="e#49022#49280#2" expanded="true" />
  843 + <element signature="e#58869#60316#2" expanded="true" />
  844 + <element signature="e#60470#61914#2" expanded="true" />
  845 + </folding>
  846 + </state>
  847 + </provider>
  848 + </entry>
564 </component> 849 </component>
565 </project> 850 </project>
@@ -31,6 +31,27 @@ @@ -31,6 +31,27 @@
31 </div> 31 </div>
32 </div> 32 </div>
33 33
  34 + <!--个人中心分享页面-->
  35 + <div class="sharewrap" v-if="shareimg" @click="sharewrap()">
  36 + <!--弹层-->
  37 + <div class="sharepopup">
  38 + <img src="../img/share.png" alt="" style="width:100%"/>
  39 +
  40 + </div>
  41 + <div class="sharetext">
  42 + <img src="../img/sharetext.png" alt=""/>
  43 + </div>
  44 + <div class="sharecontent" @click="righnow()">立即邀请</div>
  45 + </div>
  46 + <div class="rowwrap" v-if="rowshare">
  47 + <!--弹层-->
  48 + <div class="rowpopup" @click="shareorner()" >
  49 + <img src="../img/bg.png" alt="" style="width:100%"/>
  50 +
  51 + </div>
  52 +
  53 + </div>
  54 +
34 <!--个人信息--> 55 <!--个人信息-->
35 <div class="person"> 56 <div class="person">
36 <div class="person_info"> 57 <div class="person_info">
@@ -84,7 +105,7 @@ @@ -84,7 +105,7 @@
84 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" /> 105 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" />
85 <span>购物车</span> 106 <span>购物车</span>
86 </a> 107 </a>
87 - <span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span> 108 + <p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
88 </div> 109 </div>
89 <div class="footer_item footer_active"> 110 <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> 111 <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 { @@ -1956,17 +1956,17 @@ button.swiper-pagination-bullet {
1956 .swiper-lazy-preloader-white:after { 1956 .swiper-lazy-preloader-white:after {
1957 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"); 1957 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");
1958 } 1958 }
1959 -@-webkit-keyframes swiper-preloader-spin {  
1960 - 100% {  
1961 - -webkit-transform: rotate(360deg);  
1962 - }  
1963 -}  
1964 -@keyframes swiper-preloader-spin {  
1965 - 100% {  
1966 - -webkit-transform: rotate(360deg);  
1967 - transform: rotate(360deg);  
1968 - }  
1969 -} 1959 +/*@-webkit-keyframes swiper-preloader-spin {*/
  1960 + /*100% {*/
  1961 + /*-webkit-transform: rotate(360deg);*/
  1962 + /*}*/
  1963 +/*}*/
  1964 +/*@keyframes swiper-preloader-spin {*/
  1965 + /*100% {*/
  1966 + /*-webkit-transform: rotate(360deg);*/
  1967 + /*transform: rotate(360deg);*/
  1968 + /*}*/
  1969 +/*}*/
1970 .weui-actionsheet { 1970 .weui-actionsheet {
1971 z-index: 10000; 1971 z-index: 10000;
1972 } 1972 }
1 .container{ 1 .container{
2 - font-family: font-family:PingFangSC-Regular;; 2 + /*font-family: font-family:PingFangSC-Regular;;*/
3 } 3 }
4 /*遮罩*/ 4 /*遮罩*/
5 .wrap{ 5 .wrap{
@@ -214,14 +214,15 @@ @@ -214,14 +214,15 @@
214 } 214 }
215 /*第四问*/ 215 /*第四问*/
216 .question_item_home{ 216 .question_item_home{
217 - display: flex; 217 + /*display: flex;*/
218 line-height: 0.64rem; 218 line-height: 0.64rem;
219 } 219 }
220 .question_item_home_text{ 220 .question_item_home_text{
221 font-size: 0.26rem; 221 font-size: 0.26rem;
222 color: #1A1A1A; 222 color: #1A1A1A;
223 margin-right: 0.2rem; 223 margin-right: 0.2rem;
224 - white-space: nowrap; 224 + display:inline-block;
  225 + /*white-space: nowrap;*/
225 } 226 }
226 .favorite_food{ 227 .favorite_food{
227 display: flex; 228 display: flex;
@@ -39,12 +39,15 @@ @@ -39,12 +39,15 @@
39 padding:10px; 39 padding:10px;
40 font-family:inherit; 40 font-family:inherit;
41 } 41 }
  42 + [v-cloak]{
  43 + display:none
  44 + }
42 </style> 45 </style>
43 <link rel="stylesheet" href="css/pickout.css"/> 46 <link rel="stylesheet" href="css/pickout.css"/>
44 </head> 47 </head>
45 48
46 <body> 49 <body>
47 - <div class="container" id="hopeaddress"> 50 + <div class="container" id="hopeaddress" v-cloak>
48 <div class="question_item"> 51 <div class="question_item">
49 <div class="question_tit"> 52 <div class="question_tit">
50 </div> 53 </div>

30.2 KB
@@ -98,6 +98,9 @@ @@ -98,6 +98,9 @@
98 color: #FFFFFF; 98 color: #FFFFFF;
99 font-size: 0.2rem; 99 font-size: 0.2rem;
100 } 100 }
  101 + body{
  102 + -webkit-overflow-scrolling:touch;
  103 + }
101 </style> 104 </style>
102 </head> 105 </head>
103 106
@@ -168,9 +171,11 @@ @@ -168,9 +171,11 @@
168 </div> 171 </div>
169 <!--导航列表--> 172 <!--导航列表-->
170 <div class="nav"> 173 <div class="nav">
171 - <ul class="nav_list">  
172 - <li class="nav_list_item active" @click="allfood()">全部美食</li>  
173 - <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> 174 + <ul class="nav_list" style="overflow-x: scroll">
  175 + <li class="nav_list_item active" @click="allfood()" :style="{'width':'auto'}">全部美食</li>
  176 +
  177 + <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>
  178 + <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>
174 </ul> 179 </ul>
175 </div> 180 </div>
176 <!--swiper--> 181 <!--swiper-->
@@ -247,7 +252,7 @@ @@ -247,7 +252,7 @@
247 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" /> 252 <a href="{:U('Template/shopcar')}"><img src="/themes/simplebootx/Portal/Template/img/9拷贝@2x.png" />
248 <span>购物车</span> 253 <span>购物车</span>
249 </a> 254 </a>
250 - <span class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</span> 255 + <p class="foot_cartnum" v-if="cartnum>0">{{cartnum}}</p>
251 </div> 256 </div>
252 <div class="footer_item"> 257 <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> 258 <a href="{:U('Template/PersonCenter')}"><img src="/themes/simplebootx/Portal/Template/img/menu_icon3_select@2x.png" /><span>我的</span></a>
@@ -307,7 +312,7 @@ @@ -307,7 +312,7 @@
307 active.style.left = 1.8 + 'rem'; 312 active.style.left = 1.8 + 'rem';
308 wrap.style.display = 'block'; 313 wrap.style.display = 'block';
309 eat_popup.style.display = 'block'; 314 eat_popup.style.display = 'block';
310 - container.style.overflowY = 'none'; 315 + container.style.overflowY = 'hidden';
311 316
312 } 317 }
313 head_tab_left.onclick = function() { 318 head_tab_left.onclick = function() {
@@ -315,7 +320,7 @@ @@ -315,7 +320,7 @@
315 active.style.left = 0 + 'rem'; 320 active.style.left = 0 + 'rem';
316 wrap.style.display = 'block'; 321 wrap.style.display = 'block';
317 popup.style.display = 'block'; 322 popup.style.display = 'block';
318 - container.style.overflowY = 'none'; 323 + container.style.overflowY = 'hidden';
319 } 324 }
320 wrap.onclick = function() { 325 wrap.onclick = function() {
321 wrap.style.display = 'none'; 326 wrap.style.display = 'none';
@@ -241,10 +241,10 @@ $(".footer").click(function() { @@ -241,10 +241,10 @@ $(".footer").click(function() {
241 alert("请填写评价内容"); 241 alert("请填写评价内容");
242 return false; 242 return false;
243 } 243 }
244 - if(imgurl == '') {  
245 - alert("请选择图片");  
246 - return false;  
247 - } 244 + //if(imgurl == '') {
  245 + // alert("请选择图片");
  246 + // return false;
  247 + //}
248 248
249 console.log(imgurl.join(',')); 249 console.log(imgurl.join(','));
250 // var img = JSON.stringify(imgurl); 250 // var img = JSON.stringify(imgurl);
@@ -64,15 +64,13 @@ new Vue({ @@ -64,15 +64,13 @@ new Vue({
64 /*console.log(JSON.stringify(res))*/ 64 /*console.log(JSON.stringify(res))*/
65 console.log(res); 65 console.log(res);
66 var data=res.data; 66 var data=res.data;
67 - that.province=data;  
68 -  
69 var ob={ 67 var ob={
70 province_id:'000', 68 province_id:'000',
71 province_name:'省' 69 province_name:'省'
72 } 70 }
73 - that.province.push(ob);  
74 - console.log(that.province);  
75 - that.proce=that.province[31]; 71 + data.unshift(ob);
  72 + that.province=data;
  73 + that.proce=that.province[0];
76 }) 74 })
77 }, 75 },
78 //选择城市 76 //选择城市
@@ -97,7 +95,13 @@ new Vue({ @@ -97,7 +95,13 @@ new Vue({
97 ajaxsend(url, params, function(res) { 95 ajaxsend(url, params, function(res) {
98 /*console.log(JSON.stringify(res))*/ 96 /*console.log(JSON.stringify(res))*/
99 console.log(res); 97 console.log(res);
  98 + var obcity={
  99 + province_id:'000',
  100 + city_name:'市'
  101 + };
  102 + res.data.unshift(obcity)
100 that.city=res.data; 103 that.city=res.data;
  104 + that.ci=that.city[0];
101 105
102 }) 106 })
103 }, 107 },
@@ -116,7 +120,13 @@ new Vue({ @@ -116,7 +120,13 @@ new Vue({
116 ajaxsend(url, params, function(res) { 120 ajaxsend(url, params, function(res) {
117 /*console.log(JSON.stringify(res))*/ 121 /*console.log(JSON.stringify(res))*/
118 console.log(res); 122 console.log(res);
  123 + var obscounty={
  124 + county_id:'000',
  125 + county_name:'区'
  126 + };
  127 + res.data.unshift( obscounty);
119 that.county=res.data; 128 that.county=res.data;
  129 + that.coun=that.county[0];
120 }) 130 })
121 }, 131 },
122 selectstreet:function(res){ 132 selectstreet:function(res){
@@ -135,7 +145,13 @@ new Vue({ @@ -135,7 +145,13 @@ new Vue({
135 ajaxsend(url, params, function(res) { 145 ajaxsend(url, params, function(res) {
136 /*console.log(JSON.stringify(res))*/ 146 /*console.log(JSON.stringify(res))*/
137 console.log(res); 147 console.log(res);
  148 + var obstreet={
  149 + town_id:'000',
  150 + town_name:'街道'
  151 + };
  152 + res.data.unshift(obstreet);
138 that.street=res.data; 153 that.street=res.data;
  154 + that.stre=that.street[0];
139 }) 155 })
140 }, 156 },
141 //街道 157 //街道
@@ -188,7 +204,7 @@ new Vue({ @@ -188,7 +204,7 @@ new Vue({
188 city_id:city_id, 204 city_id:city_id,
189 town:town, 205 town:town,
190 town_id:town_id, 206 town_id:town_id,
191 - detailaddress:that.detailaddress, 207 + address:that.detailaddress,
192 unique_id: localStorage.getItem('unique_id') 208 unique_id: localStorage.getItem('unique_id')
193 } 209 }
194 ajaxsend(url, params, function(res) { 210 ajaxsend(url, params, function(res) {
@@ -188,6 +188,26 @@ new Vue({ @@ -188,6 +188,26 @@ new Vue({
188 var data=res.data; 188 var data=res.data;
189 var selfarea=data.area; 189 var selfarea=data.area;
190 that.selfarea=selfarea; 190 that.selfarea=selfarea;
  191 + that.ads();
  192 + })
  193 + },
  194 + ads(){
  195 + var that=this;
  196 + console.log(that.selfarea[0]);
  197 + var areaid=that.selfarea[0].area_id;
  198 + var url = '/Spot/index';
  199 + var params = {
  200 + area_id: areaid,
  201 + unique_id: localStorage.getItem('unique_id')
  202 + }
  203 +
  204 + ajaxsend(url, params, function(res) {
  205 + /*console.log(JSON.stringify(res))*/
  206 + console.log(res);
  207 + var data=res.data;
  208 + var spot=data.spot;
  209 + that.spot=spot;
  210 +
191 }) 211 })
192 }, 212 },
193 //每个区域的自提点 213 //每个区域的自提点
@@ -318,6 +338,40 @@ new Vue({ @@ -318,6 +338,40 @@ new Vue({
318 alert('请输入正确手机号码'); 338 alert('请输入正确手机号码');
319 return false; 339 return false;
320 } 340 }
  341 +
  342 +
  343 + var order_note=that.remark;
  344 + var payment=that.payment;
  345 + var discount_coupon_id=that.discount_coupon_id;
  346 + var url = '/Flow/done'
  347 + var params = {
  348 + unique_id: localStorage.getItem('unique_id'),
  349 + consignee:nick_name,
  350 + tel:tel_phone,
  351 + cart_id_str:id,
  352 + order_type:ordertype,
  353 + spot_id:spot_id,
  354 + order_notes:order_note,
  355 + payment:payment,
  356 + discount_coupon_id:discount_coupon_id,
  357 + pick_up_time:pick_up_time,
  358 + from:2
  359 + }
  360 +
  361 +
  362 + ajaxsend(url, params, function(res) {
  363 + /*console.log(JSON.stringify(res))*/
  364 + console.log(res);
  365 + if(res.status==true){
  366 + alert("下单成功");
  367 + //window.location.reload();
  368 + window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
  369 + }else if(res.status==false){
  370 + alert(res.msg);
  371 + alert("下单失败");
  372 + }
  373 +
  374 + })
321 }else if(ordertype==2){ 375 }else if(ordertype==2){
322 store_id=localStorage.getItem('store_id'); 376 store_id=localStorage.getItem('store_id');
323 377
@@ -326,7 +380,6 @@ new Vue({ @@ -326,7 +380,6 @@ new Vue({
326 alert("请选择打印机"); 380 alert("请选择打印机");
327 return false; 381 return false;
328 } 382 }
329 - }  
330 383
331 var order_note=that.remark; 384 var order_note=that.remark;
332 var payment=that.payment; 385 var payment=that.payment;
@@ -334,16 +387,12 @@ new Vue({ @@ -334,16 +387,12 @@ new Vue({
334 var url = '/Flow/done' 387 var url = '/Flow/done'
335 var params = { 388 var params = {
336 unique_id: localStorage.getItem('unique_id'), 389 unique_id: localStorage.getItem('unique_id'),
337 - consignee:nick_name,  
338 - tel:tel_phone,  
339 cart_id_str:id, 390 cart_id_str:id,
340 order_type:ordertype, 391 order_type:ordertype,
341 - spot_id:spot_id,  
342 store_id:store_id, 392 store_id:store_id,
343 order_notes:order_note, 393 order_notes:order_note,
344 payment:payment, 394 payment:payment,
345 discount_coupon_id:discount_coupon_id, 395 discount_coupon_id:discount_coupon_id,
346 - pick_up_time:pick_up_time,  
347 printer_id:printer_id, 396 printer_id:printer_id,
348 from:2 397 from:2
349 } 398 }
@@ -362,6 +411,42 @@ new Vue({ @@ -362,6 +411,42 @@ new Vue({
362 } 411 }
363 412
364 }) 413 })
  414 + }
  415 +
  416 + //var order_note=that.remark;
  417 + //var payment=that.payment;
  418 + //var discount_coupon_id=that.discount_coupon_id;
  419 + //var url = '/Flow/done'
  420 + //var params = {
  421 + // unique_id: localStorage.getItem('unique_id'),
  422 + // consignee:nick_name,
  423 + // tel:tel_phone,
  424 + // cart_id_str:id,
  425 + // order_type:ordertype,
  426 + // spot_id:spot_id,
  427 + // store_id:store_id,
  428 + // order_notes:order_note,
  429 + // payment:payment,
  430 + // discount_coupon_id:discount_coupon_id,
  431 + // pick_up_time:pick_up_time,
  432 + // printer_id:printer_id,
  433 + // from:2
  434 + //}
  435 + //
  436 + //
  437 + //ajaxsend(url, params, function(res) {
  438 + // /*console.log(JSON.stringify(res))*/
  439 + // console.log(res);
  440 + // if(res.status==true){
  441 + // alert("下单成功");
  442 + // //window.location.reload();
  443 + // window.location.href=linkPath+'/PersonCenter/PersonCenter.html'
  444 + // }else if(res.status==false){
  445 + // alert(res.msg);
  446 + // alert("下单失败");
  447 + // }
  448 + //
  449 + //})
365 450
366 } 451 }
367 452
@@ -47,6 +47,29 @@ new Vue({ @@ -47,6 +47,29 @@ new Vue({
47 console.log(that.cartnum); 47 console.log(that.cartnum);
48 }) 48 })
49 }, 49 },
  50 + //分享页面
  51 + share:function(){
  52 + var that=this;
  53 + that.shareimg=true;
  54 + },
  55 + sharewrap:function(){
  56 + var that=this;
  57 + that.shareimg=false;
  58 +
  59 + },
  60 + //立即邀请
  61 + righnow:function(){
  62 + var that=this;
  63 + that.shareimg=false;
  64 + that.rowshare=true;
  65 + },
  66 +
  67 + shareorner:function(){
  68 +
  69 + var that=this;
  70 + that.rowshare=false;
  71 +
  72 + },
50 //关于我们 73 //关于我们
51 aboutus:function(){ 74 aboutus:function(){
52 window.location.href="/index.php?g=&m=template&a=about"; 75 window.location.href="/index.php?g=&m=template&a=about";
@@ -167,9 +167,10 @@ new Vue({ @@ -167,9 +167,10 @@ new Vue({
167 province_id:'000', 167 province_id:'000',
168 province_name:'省' 168 province_name:'省'
169 } 169 }
170 - that.province.push(ob); 170 + data.unshift(ob);
  171 + that.province=data;
171 console.log(that.province); 172 console.log(that.province);
172 - that.proce=that.province[31]; 173 + that.proce=that.province[0];
173 174
174 }) 175 })
175 }, 176 },
@@ -190,8 +191,14 @@ new Vue({ @@ -190,8 +191,14 @@ new Vue({
190 ajaxsend(url, params, function(res) { 191 ajaxsend(url, params, function(res) {
191 /*console.log(JSON.stringify(res))*/ 192 /*console.log(JSON.stringify(res))*/
192 console.log(res); 193 console.log(res);
  194 + var obcity={
  195 + province_id:'000',
  196 + city_name:'市'
  197 + };
  198 + res.data.unshift(obcity);
193 that.city=res.data; 199 that.city=res.data;
194 - console.log(res.data[0]); 200 + that.ci=that.city[0];
  201 +
195 202
196 }) 203 })
197 }, 204 },
@@ -210,7 +217,13 @@ new Vue({ @@ -210,7 +217,13 @@ new Vue({
210 ajaxsend(url, params, function(res) { 217 ajaxsend(url, params, function(res) {
211 /*console.log(JSON.stringify(res))*/ 218 /*console.log(JSON.stringify(res))*/
212 console.log(res); 219 console.log(res);
  220 + var obscounty={
  221 + county_id:'000',
  222 + county_name:'区'
  223 + };
  224 + res.data.unshift( obscounty);
213 that.county=res.data; 225 that.county=res.data;
  226 + that.coun=that.county[0];
214 227
215 228
216 }) 229 })
@@ -230,7 +243,13 @@ new Vue({ @@ -230,7 +243,13 @@ new Vue({
230 ajaxsend(url, params, function(res) { 243 ajaxsend(url, params, function(res) {
231 /*console.log(JSON.stringify(res))*/ 244 /*console.log(JSON.stringify(res))*/
232 console.log(res); 245 console.log(res);
  246 + var obstreet={
  247 + town_id:'000',
  248 + town_name:'街道'
  249 + };
  250 + res.data.unshift(obstreet);
233 that.street=res.data; 251 that.street=res.data;
  252 + that.stre=that.street[0];
234 }) 253 })
235 }, 254 },
236 //街道 255 //街道
@@ -303,8 +322,13 @@ new Vue({ @@ -303,8 +322,13 @@ new Vue({
303 ajaxsend(url, params, function(res) { 322 ajaxsend(url, params, function(res) {
304 /*console.log(JSON.stringify(res))*/ 323 /*console.log(JSON.stringify(res))*/
305 console.log(res); 324 console.log(res);
  325 + var obcity={
  326 + province_id:'000',
  327 + city_name:'市'
  328 + };
  329 + res.data.unshift(obcity)
306 that.selfcity=res.data; 330 that.selfcity=res.data;
307 - console.log(that.selfcity); 331 + that.selfc=that.selfcity[0];
308 }) 332 })
309 }, 333 },
310 334
@@ -391,7 +415,7 @@ new Vue({ @@ -391,7 +415,7 @@ new Vue({
391 city_id:city_id, 415 city_id:city_id,
392 town:town, 416 town:town,
393 town_id:town_id, 417 town_id:town_id,
394 - detailaddress:that.detailaddress, 418 + address:that.detailaddress,
395 f_city:f_city, 419 f_city:f_city,
396 f_province:f_province, 420 f_province:f_province,
397 taste:that.answer1, 421 taste:that.answer1,
@@ -409,7 +433,6 @@ new Vue({ @@ -409,7 +433,6 @@ new Vue({
409 that.success=false; 433 that.success=false;
410 alert(res.msg) 434 alert(res.msg)
411 } 435 }
412 -//  
413 436
414 }) 437 })
415 }, 438 },
@@ -314,6 +314,10 @@ @@ -314,6 +314,10 @@
314 /*-webkit-transition: 300ms;*/ 314 /*-webkit-transition: 300ms;*/
315 /*transition: 300ms;*/ 315 /*transition: 300ms;*/
316 /*}*/ 316 /*}*/
  317 +
  318 + body{
  319 + -webkit-overflow-scrolling:touch;
  320 + }
317 </style> 321 </style>
318 </head> 322 </head>
319 323
@@ -84,6 +84,7 @@ @@ -84,6 +84,7 @@
84 <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"> 84 <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">
85 <!--<option value="" style="font-size:0.26rem">省</option>--> 85 <!--<option value="" style="font-size:0.26rem">省</option>-->
86 <!--<option disabled value="">请选择</option>--> 86 <!--<option disabled value="">请选择</option>-->
  87 +
87 <option value="" style="font-size:0.26rem" v-for="item in province" :value="item">{{item.province_name}}</option> 88 <option value="" style="font-size:0.26rem" v-for="item in province" :value="item">{{item.province_name}}</option>
88 </select> 89 </select>
89 90
@@ -106,7 +107,7 @@ @@ -106,7 +107,7 @@
106 <!--第二问--> 107 <!--第二问-->
107 <div class="question_item"> 108 <div class="question_item">
108 <div class="question_tit"> 109 <div class="question_tit">
109 - <span class="question_num">2</span><span class="question_tit_text">{{question3.title}}</span> 110 + <span class="question_num">4</span><span class="question_tit_text">{{question3.title}}</span>
110 </div> 111 </div>
111 <div class="question_item_wrap"> 112 <div class="question_item_wrap">
112 <div class="question_item_home"> 113 <div class="question_item_home">
@@ -114,6 +115,7 @@ @@ -114,6 +115,7 @@
114 <!--<span class="question_answer_street"><p>省市</p> &gt;</span> 115 <!--<span class="question_answer_street"><p>省市</p> &gt;</span>
115 <span class="question_answer_item">市 &gt;<span></span></span> 116 <span class="question_answer_item">市 &gt;<span></span></span>
116 <span class="question_answer_street"><p>区县</p> &gt;</span>--> 117 <span class="question_answer_street"><p>区县</p> &gt;</span>-->
  118 + <div style="height:1.2rem">
117 <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" > 119 <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" >
118 <!--<option value="" style="font-size:0.26rem" >省</option>--> 120 <!--<option value="" style="font-size:0.26rem" >省</option>-->
119 <option value="" style="font-size:0.26rem" :value="item" v-for="item in selfprovince">{{item.province_name}}</option> 121 <option value="" style="font-size:0.26rem" :value="item" v-for="item in selfprovince">{{item.province_name}}</option>
@@ -128,6 +130,8 @@ @@ -128,6 +130,8 @@
128 </select> 130 </select>
129 <span class="question_item_home_text" style="margin-left: 0.2px;">{{question3_title2}}</span> 131 <span class="question_item_home_text" style="margin-left: 0.2px;">{{question3_title2}}</span>
130 </div> 132 </div>
  133 +
  134 + </div>
131 <div class="favorite_food"> 135 <div class="favorite_food">
132 <span>{{question3_title3}}</span><input type="textbox" v-model="food"/> 136 <span>{{question3_title3}}</span><input type="textbox" v-model="food"/>
133 </div> 137 </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_to180rktm1butyb9.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,7 +55,9 @@ @@ -55,7 +55,9 @@
55 text-align: center; 55 text-align: center;
56 line-height: 0.36rem; 56 line-height: 0.36rem;
57 } 57 }
58 - 58 + body{
  59 + -webkit-overflow-scrolling:touch;
  60 + }
59 </style> 61 </style>
60 </head> 62 </head>
61 63
@@ -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>