From 6d48c05f3215905fffbd86784fe8cd225b63f9af Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Wed, 21 Aug 2019 11:30:07 +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         | 92 ++++++++++++++++++++-----------------
 mina                        |  2 +-
 web/controllers/api/Food.py |  2 +-
 3 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b1c8929..0f849dd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习" />
+    <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
+      <change beforePath="$PROJECT_DIR$/mina/pages/shangpin/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/mina/pages/shangpin/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/controllers/api/Food.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/controllers/api/Food.py" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,8 +16,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="759">
-              <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
+            <state relative-caret-position="171">
+              <caret line="88" column="13" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="88" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -28,16 +31,16 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="434">
-              <caret line="39" column="40" selection-start-line="39" selection-start-column="40" selection-end-line="39" selection-end-column="40" />
+            <state relative-caret-position="558">
+              <caret line="40" column="48" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="620">
@@ -72,8 +75,8 @@
       <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="217">
-              <caret line="7" selection-start-line="7" selection-end-line="7" />
+            <state relative-caret-position="279">
+              <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -114,11 +117,11 @@
       <find>getUserInfo</find>
       <find>area</find>
       <find>page-body-button</find>
-      <find>getFoodList</find>
       <find>/food/index</find>
       <find>getBannerAndCat</find>
       <find>事件处理函数</find>
       <find>toSearch</find>
+      <find>getFoodList</find>
     </findStrings>
     <replaceStrings>
       <replace>ops_render</replace>
@@ -143,7 +146,6 @@
         <option value="$PROJECT_DIR$/web/controllers/api/Jieshap.py" />
         <option value="$PROJECT_DIR$/web/controllers/api/Jieshao.py" />
         <option value="$PROJECT_DIR$/web/interceptors/AuthInterceptor.py" />
-        <option value="$PROJECT_DIR$/web/controllers/api/Food.py" />
         <option value="$PROJECT_DIR$/web/controllers/api/__init__.py" />
         <option value="$PROJECT_DIR$/mina/pages/posts/post.wxml" />
         <option value="$PROJECT_DIR$/mina/pages/posts/post.js" />
@@ -179,8 +181,9 @@
         <option value="$PROJECT_DIR$/mina/app.json" />
         <option value="$PROJECT_DIR$/mina/app.js" />
         <option value="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" />
-        <option value="$PROJECT_DIR$/mina/pages/shangpin/index.js" />
         <option value="$PROJECT_DIR$/config/production_setting.py" />
+        <option value="$PROJECT_DIR$/mina/pages/shangpin/index.js" />
+        <option value="$PROJECT_DIR$/web/controllers/api/Food.py" />
       </list>
     </option>
   </component>
@@ -596,7 +599,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566357199810</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <task id="LOCAL-00040" summary="python学习">
+      <created>1566357689954</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1566357689954</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="TodoView">
@@ -810,13 +820,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="759">
-          <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mina/app.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="341">
@@ -824,20 +827,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/base_setting.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="473">
-          <caret line="44" selection-start-line="44" selection-end-line="46" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/production_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/local_setting.py">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -846,13 +835,6 @@
         <state relative-caret-position="-186" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="434">
-          <caret line="39" column="40" selection-start-line="39" selection-start-column="40" selection-end-line="39" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/venv/Lib/site-packages/flask/app.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -874,5 +856,33 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config/production_setting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="279">
+          <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/base_setting.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="473">
+          <caret line="44" selection-start-line="44" selection-end-line="46" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="88" column="13" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="88" selection-end-column="13" />
+        </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="558">
+          <caret line="40" column="48" selection-start-line="40" selection-start-column="48" selection-end-line="40" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/mina b/mina
index 0546c99..1853724 160000
--- a/mina
+++ b/mina
@@ -1 +1 @@
-Subproject commit 0546c9948219bb58b2d55863193ee68b3f08e33d
+Subproject commit 18537249d594373edaf318014a7dc71fc5f32bba
diff --git a/web/controllers/api/Food.py b/web/controllers/api/Food.py
index 5506d97..948f050 100644
--- a/web/controllers/api/Food.py
+++ b/web/controllers/api/Food.py
@@ -38,7 +38,7 @@ def foodIndex():
             tmp_data = {
                 'id':item.id,
                 # 'pic_url':UrlManager.buildImageUrl( item.main_image )
-                'pic_url': '106.52.204.179:8999'+item.main_image
+                'pic_url': '106.52.204.179:8999/'+item.main_image
             }
             data_food_list.append( tmp_data )