From e11445ed4825158bcb84f07c7cf01ac1a59ae624 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Tue, 20 Aug 2019 11:52:31 +0800
Subject: [PATCH] =?UTF-8?q?python=E5=AD=A6=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 608 +++++++++++++++++++++-----------------------
 mina                |   2 +-
 2 files changed, 289 insertions(+), 321 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7c32ce3..0c2f7f4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,47 +2,71 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
-      <change afterPath="$PROJECT_DIR$/mina/images/location.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/nav/contact.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/nav/contact_selected.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/nav/product.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/images/nav/product_selected.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.wxss" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/location/index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/location/index.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/location/index.wxss" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/logs/logs.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/logs/logs.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/logs/logs.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/logs/logs.wxss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/mina/images/kefu.jpg" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mina/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/mina/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/chufang_01.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/chufang_02.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/chufang_03.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/chufang_05.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/keting_01.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/keting_02.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/keting_03.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/keting_04.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/keting_05.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/keting_06.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/shangpin_01.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/shangpin_02.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/shangpin_03.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/shufang_01.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/shufang_02.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/shufang_03.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/wushi_01.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/wushi_02.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/wushi_03.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/images/shop/wushi_04.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/index/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/index/index.wxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/cart/index.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/cart/index.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/cart/index.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/cart/index.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/index.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/index.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/index.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/index.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/info.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/info.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/info.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/food/info.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/get-location/format-location.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/get-location/get-location.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/get-location/get-location.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/get-location/get-location.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/get-location/get-location.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/kefuindex/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/kefuindex/index.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/kefuindex/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.wxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/kefuindex/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/kefuindex/index.wxss" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/location/index.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/location/index.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/location/index.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressList.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressList.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressList.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressList.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressSet.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressSet.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressSet.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/addressSet.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/comment.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/comment.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/comment.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/comment.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/commentList.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/commentList.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/commentList.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/commentList.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/index.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/index.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/index.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/index.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_info.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_info.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_info.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_info.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_list.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_list.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_list.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/my/order_list.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/open-location/open-location.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/open-location/open-location.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/open-location/open-location.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/open-location/open-location.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/order/index.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/order/index.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/order/index.wxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/order/index.wxss" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/posts/post.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/posts/post.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/mina/pages/shangpin/index.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/shangpin/index.json" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -52,90 +76,72 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="585">
-              <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/location/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="558">
-              <caret line="18" column="6" lean-forward="true" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/mina/app.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="501">
-              <caret line="64" column="7" lean-forward="true" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
+            <state relative-caret-position="-181">
+              <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxss">
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="31">
+              <caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <caret selection-end-line="2" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxml">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/mina/app.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="217">
+              <caret line="7" column="16" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.json">
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/index/index.wxml">
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="277">
-              <caret line="15" selection-start-line="15" selection-end-line="15" />
-            </state>
+            <state relative-caret-position="-10077" />
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxml">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="31">
-              <caret line="1" selection-start-line="1" selection-end-line="12" selection-end-column="9" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxss">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/app.wxss">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="9" column="55" lean-forward="true" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="341">
-              <caret line="11" column="3" selection-start-line="1" selection-start-column="2" selection-end-line="11" selection-end-column="3" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxss">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
     </leaf>
@@ -149,10 +155,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>page_params</find>
-      <find>保</find>
-      <find>指定</find>
-      <find>sav</find>
       <find>save</find>
       <find>wrap_cat_set</find>
       <find>img_k</find>
@@ -177,8 +179,12 @@
       <find>美食</find>
       <find>search</find>
       <find>index</find>
-      <find>getUserInfo</find>
       <find>contact</find>
+      <find>avatar</find>
+      <find>userinfo</find>
+      <find>getUserInfo</find>
+      <find>area</find>
+      <find>page-body-button</find>
     </findStrings>
     <replaceStrings>
       <replace>ops_render</replace>
@@ -190,15 +196,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/mina/pages/food/info.js" />
-        <option value="$PROJECT_DIR$/mina/pages/cart/index.js" />
-        <option value="$PROJECT_DIR$/mina/pages/cart/index.wxml" />
-        <option value="$PROJECT_DIR$/mina/pages/order/index.js" />
-        <option value="$PROJECT_DIR$/mina/pages/order/index.wxml" />
-        <option value="$PROJECT_DIR$/web/controllers/api/My.py" />
-        <option value="$PROJECT_DIR$/manager.py" />
-        <option value="$PROJECT_DIR$/web/controllers/finance/Finance.py" />
-        <option value="$PROJECT_DIR$/web/templates/food/index.html" />
         <option value="$PROJECT_DIR$/web/templates/stat/index.html" />
         <option value="$PROJECT_DIR$/web/controllers/user/User.py" />
         <option value="$PROJECT_DIR$/web/static/js/user/login.js" />
@@ -235,12 +232,21 @@
         <option value="$PROJECT_DIR$/config/production_setting.py" />
         <option value="$PROJECT_DIR$/config/base_setting.py" />
         <option value="$PROJECT_DIR$/mina/utils/util.js" />
-        <option value="$PROJECT_DIR$/mina/app.js" />
         <option value="$PROJECT_DIR$/mina/pages/index/index.js" />
         <option value="$PROJECT_DIR$/mina/pages/index/index.wxml" />
-        <option value="$PROJECT_DIR$/mina/app.json" />
+        <option value="$PROJECT_DIR$/mina/pages/open-location/open-location.wxml" />
+        <option value="$PROJECT_DIR$/mina/pages/location/index.js" />
+        <option value="$PROJECT_DIR$/mina/pages/location/index.wxss" />
+        <option value="$PROJECT_DIR$/mina/pages/location/index.wxml" />
         <option value="$PROJECT_DIR$/mina/pages/kefuindex/index.js" />
         <option value="$PROJECT_DIR$/mina/pages/kefuindex/index.wxml" />
+        <option value="$PROJECT_DIR$/mina/pages/kefuindex/index.wxss" />
+        <option value="$PROJECT_DIR$/mina/pages/location/index.json" />
+        <option value="$PROJECT_DIR$/mina/pages/kefuindex/index.json" />
+        <option value="$PROJECT_DIR$/mina/pages/posts/post.json" />
+        <option value="$PROJECT_DIR$/mina/app.js" />
+        <option value="$PROJECT_DIR$/mina/app.json" />
+        <option value="$PROJECT_DIR$/mina/pages/shangpin/index.json" />
       </list>
     </option>
   </component>
@@ -265,7 +271,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -312,14 +317,7 @@
               <item name="order" type="462c0819:PsiDirectoryNode" />
               <item name="mina" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="location" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="mina" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="open-location" type="462c0819:PsiDirectoryNode" />
+              <item name="shangpin" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
@@ -343,12 +341,13 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/mina/images" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/mina/pages/shangpin" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="options.lastSelected" value="com.jetbrains.python.configuration.PythonSdkConfigurable" />
@@ -358,19 +357,19 @@
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\order\mina\images" />
-      <recent name="D:\order\mina\pages" />
-      <recent name="D:\order\mina\images\nav" />
-      <recent name="D:\order\mina" />
-      <recent name="D:\order\mina\utils" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\order\mina\images\nav" />
       <recent name="D:\order\common\libs" />
       <recent name="D:\order\web" />
       <recent name="D:\order\web\controllers\user" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\order\mina\pages\shangpin" />
+      <recent name="D:\order\mina\pages\location" />
+      <recent name="D:\order\mina\images" />
+      <recent name="D:\order\mina\pages" />
+      <recent name="D:\order\mina\images\nav" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -641,7 +640,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566177371013</updated>
     </task>
-    <option name="localTasksCounter" value="36" />
+    <task id="LOCAL-00036" summary="python学习">
+      <created>1566261211447</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1566261211447</updated>
+    </task>
+    <option name="localTasksCounter" value="37" />
     <servers />
   </component>
   <component name="TodoView">
@@ -696,135 +702,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="python学习" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/common/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="31">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/libs/LogService.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/account/Account.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/libs/user/UserService.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="78">
-          <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/models/User.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/user/User.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/readme.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/venv/Lib/site-packages/flask_sqlalchemy/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="927" lean-forward="true" selection-start-line="927" selection-end-line="927" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/manager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="558">
-          <caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
-          <folding>
-            <element signature="e#24#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/models/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="62">
-          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="31">
-          <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
-          <folding>
-            <element signature="e#24#47#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="62">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/imooc.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/com">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hello.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="558">
-          <caret line="18" column="23" lean-forward="true" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#31#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/api/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="62">
-          <caret line="2" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="463">
-          <caret line="30" column="57" selection-start-line="30" selection-start-column="57" selection-end-line="30" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/static.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/local_setting.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/config/base_setting.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="496">
@@ -855,28 +732,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/app.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-963">
-          <caret line="16" column="25" lean-forward="true" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/logs/logs.js">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/logs/logs.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3002">
@@ -887,13 +748,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/api/Member.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="279">
@@ -907,15 +761,68 @@
     <entry file="file://$PROJECT_DIR$/mina/images/nav/product_selected.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/images/dianpu_s.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/images/dianpu_s.png" />
     <entry file="file://$PROJECT_DIR$/mina/images/nav/product.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/get-location/get-location.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post-item/post-item-template.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post-item/post-item-template.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="341">
+          <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="12" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="341">
+          <caret line="17" column="17" lean-forward="true" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="835">
+          <caret line="120" selection-start-line="120" selection-end-line="120" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="463">
+          <caret line="29" column="17" lean-forward="true" selection-end-line="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="461">
+          <caret line="15" column="1" lean-forward="true" selection-end-line="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.wxss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="835">
+          <caret line="53" selection-start-line="53" selection-end-line="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1612">
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/mina/project.config.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-651" />
+        <state relative-caret-position="-305" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mina/app.wxss">
@@ -925,62 +832,123 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.js">
+    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="11" column="3" selection-start-line="1" selection-start-column="2" selection-end-line="11" selection-end-column="3" />
+        <state relative-caret-position="248">
+          <caret line="8" column="20" lean-forward="true" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="20" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/index/index.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
+        <state relative-caret-position="401">
+          <caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.wxml">
+    <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
+        <state relative-caret-position="341">
+          <caret line="11" column="3" lean-forward="true" selection-start-line="1" selection-start-column="1" selection-end-line="11" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/app.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="501">
-          <caret line="64" column="7" lean-forward="true" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxss">
+    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxml">
+    <entry file="file://$PROJECT_DIR$/mina/pages/get-location/get-location.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/index.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/cart/index.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/cart/index.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/order/index.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post-detail/post-detail.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/open-location/open-location.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/location/index.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="31">
-          <caret line="1" selection-start-line="1" selection-end-line="12" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="9" column="55" lean-forward="true" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
+          <caret line="1" column="36" selection-start-line="1" selection-start-column="3" selection-end-line="1" selection-end-column="36" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/location/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="558">
-          <caret line="18" column="6" lean-forward="true" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+        <state relative-caret-position="370">
+          <caret line="109" column="21" selection-end-line="120" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.wxml">
+    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="585">
-          <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
+        <state relative-caret-position="31">
+          <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/order/index.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.json">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="2" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-10077" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="31">
+          <caret line="1" column="35" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/app.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-181">
+          <caret line="8" column="21" lean-forward="true" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="7" column="16" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="16" />
         </state>
       </provider>
     </entry>
diff --git a/mina b/mina
index 90b8502..a03de8a 160000
--- a/mina
+++ b/mina
@@ -1 +1 @@
-Subproject commit 90b8502910761c57736aec6faf4151eb471e3b35
+Subproject commit a03de8a1f777cac9a8975d3465b31080ae062f0d