From 86554b9ce9fff07f8fcb5b67a271976c08d3b684 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Wed, 23 Feb 2022 16:51:24 +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/vcs.xml                                 |   1 +
 .idea/workspace.xml                           | 832 +++++++++---------
 common/models/member/Member.py                |  19 +-
 common/models/member/Memberinfoo.py           |  18 +
 common/models/member/Membermiya.py            |  18 +
 helloo.py                                     |  11 +
 web/controllers/api/Member.py                 |  29 +-
 .../ueditor/dialogs/emotion/emotion.html      |   2 +-
 8 files changed, 478 insertions(+), 452 deletions(-)
 create mode 100644 common/models/member/Memberinfoo.py
 create mode 100644 common/models/member/Membermiya.py
 create mode 100644 helloo.py

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index b465b7e..b64f185 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/mina" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/native" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa4578a..0212902 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,28 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
+      <change afterPath="$PROJECT_DIR$/helloo.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/images/chengjie.jpg" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/index.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/index.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/index.wxml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/index.wxss" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/info.js" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/info.json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/info.wxml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/native/pages/food/info.wxss" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina" beforeDir="false" afterPath="$PROJECT_DIR$/mina" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/project.config.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/models/member/Member.py" beforeDir="false" afterPath="$PROJECT_DIR$/common/models/member/Member.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/native/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/app.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/native/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/native/app.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/native/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/config.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/native/pages/card/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/pages/card/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/native/pages/card/main.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/native/pages/card/main.wxml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/native/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/native/project.config.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/native/template/login/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/native/template/login/index.wxml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/native/utils/auth.js" beforeDir="false" afterPath="$PROJECT_DIR$/native/utils/auth.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/controllers/api/Member.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/controllers/api/Member.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/static/plugins/ueditor/dialogs/emotion/emotion.html" beforeDir="false" afterPath="$PROJECT_DIR$/web/static/plugins/ueditor/dialogs/emotion/emotion.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,91 +34,58 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2046">
-              <caret line="66" column="17" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/four/four.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="423">
-              <caret line="160" column="25" lean-forward="true" selection-start-line="160" selection-start-column="25" selection-end-line="160" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/app.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="412">
-              <caret line="56" column="10" lean-forward="true" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/native/utils/auth.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="434">
-              <caret line="37" column="85" selection-start-line="37" selection-start-column="47" selection-end-line="37" selection-end-column="85" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/native/app.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="403">
-              <caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/native/config.js">
+        <entry file="file://$PROJECT_DIR$/web/controllers/account/Account.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="155">
-              <caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
+              <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/native/app.json">
+        <entry file="file://$PROJECT_DIR$/web/controllers/user/User.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="594">
-              <caret line="43" column="23" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="23" />
+            <state relative-caret-position="310">
+              <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
+              <folding>
+                <element signature="e#24#93#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/models/User.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="341">
+              <caret line="13" column="87" lean-forward="true" selection-start-line="13" selection-start-column="87" selection-end-line="13" selection-end-column="87" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/production_setting.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="434">
+              <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/base_setting.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="271">
+              <caret line="41" column="15" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js">
+        <entry file="file://$PROJECT_DIR$/web/static/js/common.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="350">
-              <caret line="269" column="17" lean-forward="true" selection-start-line="269" selection-start-column="17" selection-end-line="269" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/native/pages/card/main.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2148">
-              <caret line="213" column="6" lean-forward="true" selection-start-line="213" selection-start-column="6" selection-end-line="213" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/native/pages/index/main.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
-              <caret line="39" column="17" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="17" />
+            <state relative-caret-position="448">
+              <caret line="159" column="21" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -121,36 +101,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>aicard/user/friend</find>
-      <find>friend</find>
-      <find>idcardCheck</find>
-      <find>detail</find>
-      <find>friend/detail</find>
-      <find>user/friend/detail</find>
-      <find>cardUid</find>
-      <find>setStorageSync</find>
-      <find>API_BASE_URL</find>
-      <find>getCardInfo</find>
-      <find>getCardUid</find>
-      <find>wx.request</find>
-      <find>friendUserDetail</find>
-      <find>user/wxapp/login</find>
-      <find>login_email</find>
-      <find>aicard</find>
-      <find>subDomain</find>
-      <find>appid</find>
-      <find>密钥</find>
-      <find>api</find>
-      <find>key</find>
-      <find>wxlogin/login</find>
-      <find>food/index</find>
-      <find>getRequestHeader</find>
-      <find>request</find>
+      <find>error</find>
+      <find>error_log</find>
+      <find>AppErrorLog</find>
+      <find>oauth_access_token</find>
+      <find>wx_share_history</find>
+      <find>api/cart/set</find>
+      <find>/set</find>
+      <find>/address/set</find>
+      <find>member_info</find>
+      <find>address/set</find>
+      <find>set</find>
+      <find>member</find>
+      <find>logintwo</find>
+      <find>loginmiya</find>
+      <find>/member/logintwo</find>
+      <find>/member/login</find>
+      <find>route_member</find>
+      <find>Member</find>
+      <find>Membermiya</find>
+      <find>/user/login</find>
+      <find>Mendianuserinfo</find>
+      <find>user/login</find>
+      <find>user_page</find>
+      <find>route_user</find>
+      <find>python815</find>
+      <find>python815.cn</find>
       <find>login</find>
-      <find>bindGetUserInfo</find>
-      <find>wx.getUserInfo</find>
-      <find>login_wx</find>
-      <find>register_complex</find>
+      <find>static/upload</find>
+      <find>prefix_url</find>
+      <find>buildPicUrl</find>
     </findStrings>
     <replaceStrings>
       <replace>ops_render</replace>
@@ -162,16 +142,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/www.py" />
-        <option value="$PROJECT_DIR$/web/static/js/common.js" />
-        <option value="$PROJECT_DIR$/web/controllers/furniture/Furniture.py" />
-        <option value="$PROJECT_DIR$/web/templates/common/layout_main.html" />
-        <option value="$PROJECT_DIR$/web/templates/furniture/index.html" />
-        <option value="$PROJECT_DIR$/common/__init__.py" />
-        <option value="$PROJECT_DIR$/hello.py" />
-        <option value="$PROJECT_DIR$/config/local_setting.py" />
-        <option value="$PROJECT_DIR$/requirements.txt" />
-        <option value="$PROJECT_DIR$/mina/utils/util.js" />
         <option value="$PROJECT_DIR$/mina/pages/index/index.wxml" />
         <option value="$PROJECT_DIR$/mina/pages/open-location/open-location.wxml" />
         <option value="$PROJECT_DIR$/mina/pages/location/index.js" />
@@ -193,7 +163,6 @@
         <option value="$PROJECT_DIR$/mina/pages/kefuindex/index.wxss" />
         <option value="$PROJECT_DIR$/mina/pages/kefuindex/index.wxml" />
         <option value="$PROJECT_DIR$/mina/pages/sdindextwo/index.wxml" />
-        <option value="$PROJECT_DIR$/mina/app.json" />
         <option value="$PROJECT_DIR$/mina/pages/food/info.wxml" />
         <option value="$PROJECT_DIR$/uwsgitwo.ini" />
         <option value="$PROJECT_DIR$/uwsgi.ini" />
@@ -203,16 +172,27 @@
         <option value="$PROJECT_DIR$/common/models/Mendianusertwo.py" />
         <option value="$PROJECT_DIR$/common/models/member/Mendianusertwo.py" />
         <option value="$PROJECT_DIR$/common/models/member/Mendianuserinfo.py" />
-        <option value="$PROJECT_DIR$/web/controllers/api/Member.py" />
         <option value="$PROJECT_DIR$/config/production_setting.py" />
         <option value="$PROJECT_DIR$/web/static/js/user/login.js" />
-        <option value="$PROJECT_DIR$/mina/pages/food/index.js" />
-        <option value="$PROJECT_DIR$/mina/app.js" />
-        <option value="$PROJECT_DIR$/mina/pages/index/index.js" />
-        <option value="$PROJECT_DIR$/native/app.json" />
         <option value="$PROJECT_DIR$/native/config.js" />
-        <option value="$PROJECT_DIR$/native/utils/auth.js" />
         <option value="$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js" />
+        <option value="$PROJECT_DIR$/native/pages/card/main.wxml" />
+        <option value="$PROJECT_DIR$/native/pages/card/main.js" />
+        <option value="$PROJECT_DIR$/native/app.json" />
+        <option value="$PROJECT_DIR$/native/app.js" />
+        <option value="$PROJECT_DIR$/native/apptwo.js" />
+        <option value="$PROJECT_DIR$/native/pages/food/index.js" />
+        <option value="$PROJECT_DIR$/native/utils/auth.js" />
+        <option value="$PROJECT_DIR$/web/static/plugins/ueditor/dialogs/emotion/emotion.html" />
+        <option value="$PROJECT_DIR$/mina/app.js" />
+        <option value="$PROJECT_DIR$/mina/pages/food/index.js" />
+        <option value="$PROJECT_DIR$/mina/pages/index/index.js" />
+        <option value="$PROJECT_DIR$/mina/pages/food/info.js" />
+        <option value="$PROJECT_DIR$/mina/app.json" />
+        <option value="$PROJECT_DIR$/helloo.py" />
+        <option value="$PROJECT_DIR$/web/controllers/api/Address.py" />
+        <option value="$PROJECT_DIR$/web/controllers/api/Member.py" />
+        <option value="$PROJECT_DIR$/web/controllers/user/User.py" />
       </list>
     </option>
   </component>
@@ -226,8 +206,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="407" />
-    <option name="y" value="57" />
+    <option name="x" value="506" />
+    <option name="y" value="15" />
     <option name="width" value="1192" />
     <option name="height" value="944" />
   </component>
@@ -247,78 +227,25 @@
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
               <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="mina" type="462c0819:PsiDirectoryNode" />
+              <item name="common" 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="common" type="462c0819:PsiDirectoryNode" />
+              <item name="models" 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="food" type="462c0819:PsiDirectoryNode" />
+              <item name="common" type="462c0819:PsiDirectoryNode" />
+              <item name="models" type="462c0819:PsiDirectoryNode" />
+              <item name="member" 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="four" 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="index" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-              <item name="miniprogram_npm" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-              <item name="miniprogram_npm" type="462c0819:PsiDirectoryNode" />
-              <item name="apifm-wxapi" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="card" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="index" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="order" type="b2602c69:ProjectViewProjectNode" />
-              <item name="order" type="462c0819:PsiDirectoryNode" />
-              <item name="native" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
@@ -329,14 +256,14 @@
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
               <item name="order" type="462c0819:PsiDirectoryNode" />
               <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
               <item name="order" type="462c0819:PsiDirectoryNode" />
               <item name="web" type="462c0819:PsiDirectoryNode" />
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -348,29 +275,30 @@
   <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$/native/utils" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../miyamer" />
     <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" />
     <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\order" />
+      <recent name="D:\order\mina\pages" />
+      <recent name="D:\order\mina\images" />
+      <recent name="D:\order\mina\images\nav" />
+      <recent name="D:\order\mina\images\more" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\order\native\images" />
       <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\native\utils" />
-      <recent name="D:\order" />
-      <recent name="D:\order\mina\pages" />
-      <recent name="D:\order\mina\pages\shangpin" />
-      <recent name="D:\order\mina\pages\location" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -396,13 +324,6 @@
       <option name="presentableId" value="Default" />
       <updated>1528044544203</updated>
     </task>
-    <task id="LOCAL-00012" summary="python学习">
-      <created>1564569007474</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1564569007474</updated>
-    </task>
     <task id="LOCAL-00013" summary="python学习">
       <created>1564628624793</created>
       <option name="number" value="00013" />
@@ -739,7 +660,14 @@
       <option name="project" value="LOCAL" />
       <updated>1605610340670</updated>
     </task>
-    <option name="localTasksCounter" value="61" />
+    <task id="LOCAL-00061" summary="python学习">
+      <created>1605852407130</created>
+      <option name="number" value="00061" />
+      <option name="presentableId" value="LOCAL-00061" />
+      <option name="project" value="LOCAL" />
+      <updated>1605852407131</updated>
+    </task>
+    <option name="localTasksCounter" value="62" />
     <servers />
   </component>
   <component name="TodoView">
@@ -755,7 +683,7 @@
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16491044" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28481013" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info id="Project Explorer" order="3" />
@@ -767,13 +695,13 @@
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.3287841" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="9" weight="0.59679407" />
+      <window_info anchor="bottom" id="Docker" order="6" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="8" weight="0.32790446" />
+      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.082519" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32698768" />
-      <window_info anchor="bottom" id="Python Console" order="12" weight="0.3287841" />
+      <window_info anchor="bottom" id="Version Control" order="11" weight="0.32681867" />
+      <window_info anchor="bottom" id="Python Console" order="12" weight="0.53311616" />
       <window_info anchor="bottom" id="Console" order="13" />
       <window_info anchor="bottom" id="DB Execution Console" order="14" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -796,298 +724,334 @@
     <option name="LAST_COMMIT_MESSAGE" value="python学习" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/common/models/member/Member.py">
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/index.wxml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="11" column="10" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="10" />
-          <folding>
-            <element signature="e#16#72#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="620">
+          <caret line="20" column="11" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/libs/member/MemberService.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="18" column="8" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/user/User.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="22" column="47" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
-          <folding>
-            <element signature="e#1788#2597#0" />
-            <element signature="e#2676#3975#0" />
-            <element signature="e#4025#4174#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/food/set.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2444" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/food/index.js">
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/index.wxss">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/food/cat.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/account/index.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/account/set.js">
+    <entry file="file://$PROJECT_DIR$/mina/pages/four/four.js" />
+    <entry file="file://$PROJECT_DIR$/mina/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="64" column="20" lean-forward="true" selection-start-line="64" selection-start-column="20" selection-end-line="64" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/finance/index.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/finance/pay_info.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-529" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/stat/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-715" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/food/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1984">
-          <caret line="64" column="40" selection-start-line="64" selection-start-column="40" selection-end-line="64" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/member/comment.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/member/index.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/account/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2294">
-          <caret line="74" column="21" lean-forward="true" selection-start-line="74" selection-start-column="21" selection-end-line="74" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/food/info.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="26" lean-forward="true" selection-start-column="26" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/common.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/stat/share.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/stat/member.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/static/js/stat/product.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="775">
-          <caret line="25" column="10" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/templates/common/layout_main.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="434">
-          <caret line="14" column="38" lean-forward="true" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/project.config.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
-          <caret line="38" column="15" lean-forward="true" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/one/one.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/one/one.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/app.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="3" column="22" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/native/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="16" column="15" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/native/project.config.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/native/pages/card/main.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="8" column="11" lean-forward="true" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/native/pages/card/main.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="55" column="8" selection-start-line="55" selection-start-column="8" selection-end-line="55" selection-end-column="8" />
-        </state>
-      </provider>
-    </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$/common/libs/pay/WeChatService.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="39" column="17" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/native/typings/wx.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="950">
-          <caret line="2393" column="62" selection-start-line="2393" selection-start-column="62" selection-end-line="2393" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/jobs/tasks/queue/index.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1767">
-          <caret line="67" lean-forward="true" selection-start-line="67" selection-end-line="67" />
+        <state relative-caret-position="-248">
+          <caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/food/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="68" column="42" selection-start-line="68" selection-start-column="32" selection-end-line="68" selection-end-column="42" />
+        <state relative-caret-position="4309">
+          <caret line="139" column="19" selection-start-line="139" selection-start-column="19" selection-end-line="139" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="13" column="52" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/info.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/my/addressList.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/.idea/vcs.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="155">
+          <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
+        <state relative-caret-position="403">
+          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/api/My.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/api/Order.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/static.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/index.py">
+    <entry file="file://$PROJECT_DIR$/hello.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
-          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        <state relative-caret-position="837">
+          <caret line="29" column="38" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#31#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/app.js">
+    <entry file="file://$PROJECT_DIR$/mina/pages/cart/index.wxss">
+      <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">
+        <state relative-caret-position="2077">
+          <caret line="67" column="6" selection-start-line="67" selection-start-column="6" selection-end-line="67" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/native/utils/pay.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="558">
+          <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/templates/account/set.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="744">
+          <caret line="24" column="21" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/utils/city.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/app.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="465">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/order/index.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/static/plugins/ueditor/dialogs/music/music.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="403">
-          <caret line="13" column="22" lean-forward="true" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
+          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/four/four.js">
+    <entry file="file://$PROJECT_DIR$/web/controllers/food/Food.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="423">
-          <caret line="160" column="25" lean-forward="true" selection-start-line="160" selection-start-column="25" selection-end-line="160" selection-end-column="25" />
+        <state relative-caret-position="322">
+          <caret line="280" column="23" lean-forward="true" selection-start-line="280" selection-start-column="23" selection-end-line="280" selection-end-column="23" />
+          <folding>
+            <element signature="e#24#76#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/utils/app.js">
+    <entry file="file://$PROJECT_DIR$/mina/pages/my/addressSet.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="381">
-          <caret line="64" column="53" lean-forward="true" selection-start-line="63" selection-start-column="10" selection-end-line="64" selection-end-column="53" />
+        <state relative-caret-position="3875">
+          <caret line="125" column="35" selection-start-line="125" selection-start-column="35" selection-end-line="125" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/app.js">
+    <entry file="file://$USER_HOME$/Documents/NetSarang Computer/7/Xftp/Temporary/Food [3].py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$USER_HOME$/Documents/NetSarang Computer/7/Xftp/Temporary/Food [4].py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
-          <caret line="56" column="10" lean-forward="true" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
+        <state relative-caret-position="1054">
+          <caret line="43" column="30" lean-forward="true" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/pages/index/main.js">
+    <entry file="file://$PROJECT_DIR$/common/libs/LogService.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="39" column="17" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="17" />
+        <state relative-caret-position="279">
+          <caret line="14" column="39" lean-forward="true" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
+          <folding>
+            <element signature="e#24#51#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/app.json">
+    <entry file="file://$PROJECT_DIR$/common/models/pay/OauthAccessToken.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="594">
-          <caret line="43" column="23" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="23" />
+        <state relative-caret-position="341">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/config.js">
+    <entry file="file://$PROJECT_DIR$/web/templates/member/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1581">
+          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/log/AppErrorLog.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="155">
-          <caret line="5" column="2" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="2" />
+          <caret line="10" column="17" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/pages/card/main.js">
+    <entry file="file://$PROJECT_DIR$/common/models/member/MemberAddress.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2148">
-          <caret line="213" column="6" lean-forward="true" selection-start-line="213" selection-start-column="6" selection-end-line="213" selection-end-column="6" />
+        <state relative-caret-position="93">
+          <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/controllers/api/Address.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="31">
+          <caret line="47" column="20" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="20" />
         </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="2046">
-          <caret line="66" column="17" selection-start-line="66" selection-start-column="17" selection-end-line="66" selection-end-column="17" />
+        <state relative-caret-position="337">
+          <caret line="94" column="38" selection-start-line="94" selection-start-column="38" selection-end-line="94" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/utils/auth.js">
+    <entry file="file://$PROJECT_DIR$/manager.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="461">
+          <caret line="16" column="8" lean-forward="true" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+          <folding>
+            <element signature="e#24#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/controllers/member/Member.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5242" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/member/Mendianuserinfo.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="124">
+          <caret line="9" column="6" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/member/Membermiya.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="403">
+          <caret line="15" column="9" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/member/MemberComments.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/controllers/api/__init__.py">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/member/Memberinfoo.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="496">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/helloo.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/member/Member.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="279">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/interceptors/AuthInterceptor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-143">
+          <caret line="36" column="46" selection-start-line="36" selection-start-column="46" selection-end-line="36" selection-end-column="46" />
+        </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="190">
+          <caret line="90" column="25" lean-forward="true" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
+          <folding>
+            <element signature="e#24#65#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/controllers/account/Account.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="155">
+          <caret line="12" column="32" lean-forward="true" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/libs/Helper.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1767">
+          <caret line="58" column="26" selection-start-line="58" selection-start-column="11" selection-end-line="58" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/controllers/user/User.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="310">
+          <caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
+          <folding>
+            <element signature="e#24#93#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/native/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/models/User.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="341">
+          <caret line="13" column="87" lean-forward="true" selection-start-line="13" selection-start-column="87" selection-end-line="13" selection-end-column="87" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="268">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/production_setting.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="434">
-          <caret line="37" column="85" selection-start-line="37" selection-start-column="47" selection-end-line="37" selection-end-column="85" />
+          <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/native/miniprogram_npm/apifm-wxapi/index.js">
+    <entry file="file://$PROJECT_DIR$/config/base_setting.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="269" column="17" lean-forward="true" selection-start-line="269" selection-start-column="17" selection-end-line="269" selection-end-column="17" />
+        <state relative-caret-position="271">
+          <caret line="41" column="15" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/web/static/js/common.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="159" column="21" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="21" />
         </state>
       </provider>
     </entry>
diff --git a/common/models/member/Member.py b/common/models/member/Member.py
index 52ee973..d76006b 100644
--- a/common/models/member/Member.py
+++ b/common/models/member/Member.py
@@ -1,7 +1,10 @@
 # coding: utf-8
 from sqlalchemy import Column, DateTime, Integer, String
 from sqlalchemy.schema import FetchedValue
-from application import app,db
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
 
 
 class Member(db.Model):
@@ -17,17 +20,3 @@ class Member(db.Model):
     status = db.Column(db.Integer, nullable=False, server_default=db.FetchedValue())
     updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
     created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
-
-
-    @property
-    def status_desc(self):
-        return app.config['STATUS_MAPPING'][ str( self.status ) ]
-
-    @property
-    def sex_desc(self):
-        sex_mapping = {
-            "0":"未知",
-            "1":"男",
-            "2":"女"
-        }
-        return sex_mapping[str(self.sex)]
\ No newline at end of file
diff --git a/common/models/member/Memberinfoo.py b/common/models/member/Memberinfoo.py
new file mode 100644
index 0000000..d6459ff
--- /dev/null
+++ b/common/models/member/Memberinfoo.py
@@ -0,0 +1,18 @@
+# coding: utf-8
+from sqlalchemy import Column, DateTime, Integer, String
+from sqlalchemy.schema import FetchedValue
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
+
+
+class Memberinfoo(db.Model):
+    __tablename__ = 'memberinfoo'
+
+    id = db.Column(db.Integer, primary_key=True)
+    nickname = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    mobile = db.Column(db.String(100), nullable=False, server_default=db.FetchedValue())
+    storename = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
+    created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
diff --git a/common/models/member/Membermiya.py b/common/models/member/Membermiya.py
new file mode 100644
index 0000000..8021e69
--- /dev/null
+++ b/common/models/member/Membermiya.py
@@ -0,0 +1,18 @@
+# coding: utf-8
+from sqlalchemy import Column, DateTime, Integer, String
+from sqlalchemy.schema import FetchedValue
+from flask_sqlalchemy import SQLAlchemy
+
+
+db = SQLAlchemy()
+
+
+class Membermiya(db.Model):
+    __tablename__ = 'membermiya'
+
+    id = db.Column(db.Integer, primary_key=True)
+    nickname = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    mobile = db.Column(db.String(11), nullable=False, server_default=db.FetchedValue())
+    token = db.Column(db.String(200), nullable=False, server_default=db.FetchedValue())
+    updated_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
+    created_time = db.Column(db.DateTime, nullable=False, server_default=db.FetchedValue())
diff --git a/helloo.py b/helloo.py
new file mode 100644
index 0000000..13e8ebf
--- /dev/null
+++ b/helloo.py
@@ -0,0 +1,11 @@
+from flask import Flask,url_for
+from imooc import route_imooc
+from flask_sqlalchemy import SQLAlchemy
+app = Flask(__name__)  # 创建1个Flask实例
+
+@app.route("/")
+def hello_world():
+    return "Hello World"
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0')
\ No newline at end of file
diff --git a/web/controllers/api/Member.py b/web/controllers/api/Member.py
index d45c2a3..2ce7a85 100644
--- a/web/controllers/api/Member.py
+++ b/web/controllers/api/Member.py
@@ -5,6 +5,8 @@ from application import  app,db
 import requests,json
 from common.models.member.Member import Member
 from common.models.member.Mendianuserinfo import Mendianuserinfo
+from common.models.member.Memberinfoo import Memberinfoo
+from common.models.member.Membermiya import Membermiya
 from common.models.member.OauthMemberBind import OauthMemberBind
 from common.models.food.WxShareHistory import WxShareHistory
 from common.libs.Helper import getCurrentDate
@@ -70,9 +72,9 @@ def logintwo():
     storename = req['storename'] if 'storename' in req else ''
     app.logger.info(storename)
 
-    name_info = Mendianuserinfo.query.filter_by(nickname=name).first()
+    name_info = Memberinfoo.query.filter_by(nickname=name).first()
     if not name_info:
-        model_mendianuserinfo = Mendianuserinfo()
+        model_mendianuserinfo = Memberinfoo()
         model_mendianuserinfo.nickname = name
         model_mendianuserinfo.mobile = phone
         model_mendianuserinfo.storename = storename
@@ -80,6 +82,29 @@ def logintwo():
         db.session.commit()
     return jsonify(resp)
 
+@route_api.route("/member/loginmiya",methods = [ "GET","POST" ])
+def loginmiya():
+    resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
+    req = request.values
+    app.logger.info(req)
+    name = req['nickname'] if 'nickname' in req else ''
+    app.logger.info(name)
+    mobile = req['mobile'] if 'mobile' in req else 0
+    app.logger.info(mobile)
+    token = req['token'] if 'token' in req else ''
+    app.logger.info(token)
+
+    miya_info = Membermiya.query.filter_by(nickname=name).first()
+    if not miya_info:
+        model_membermiya = Membermiya()
+        model_membermiya.nickname = name
+        model_membermiya.mobile = mobile
+        model_membermiya.token = token
+        db.session.add(model_membermiya)
+        db.session.commit()
+    return jsonify(resp)
+
+
 @route_api.route("/member/check-reg",methods = [ "GET","POST" ])
 def checkReg():
     resp = {'code': 200, 'msg': '操作成功~', 'data': {}}
diff --git a/web/static/plugins/ueditor/dialogs/emotion/emotion.html b/web/static/plugins/ueditor/dialogs/emotion/emotion.html
index fca0850..2188795 100644
--- a/web/static/plugins/ueditor/dialogs/emotion/emotion.html
+++ b/web/static/plugins/ueditor/dialogs/emotion/emotion.html
@@ -46,7 +46,7 @@
             tab3:['HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '泪眼', '流泪', '生气', '吐舌', '喜欢', '旋转', '再见', '抓狂', '汗', '鄙视', '拜', '吐血', '嘘', '打人', '蹦跳', '变脸', '扯肉', '吃To', '吃花', '吹泡泡糖', '大变身', '飞天舞', '回眸', '可怜', '猛抽', '泡泡', '苹果', '亲', '', '骚舞', '烧香', '睡', '套娃娃', '捅捅', '舞倒', '西红柿', '爱慕', '摇', '摇摆', '杂耍', '招财', '被殴', '被球闷', '大惊', '理想', '欧打', '呕吐', '碎', '吐痰'],
             tab4:['发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '顶', '幸运', '爱心', '躲', '送花', '选择'],
             tab5:['微笑', '亲吻', '调皮', '惊讶', '耍酷', '发火', '害羞', '汗水', '大哭', '得意', '鄙视', '困', '夸奖', '晕倒', '疑问', '媒婆', '狂吐', '青蛙', '发愁', '亲吻', '', '爱心', '心碎', '玫瑰', '礼物', '哭', '奸笑', '可爱', '得意', '呲牙', '暴汗', '楚楚可怜', '困', '哭', '生气', '惊讶', '口水', '彩虹', '夜空', '太阳', '钱钱', '灯泡', '咖啡', '蛋糕', '音乐', '爱', '胜利', '赞', '鄙视', 'OK'],
-            tab6:['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '天使', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
+            tab6:['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
         }
     };
 </script>