From c50eb851ad8de33304c8ad3536bdf62898b85d0d Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Wed, 21 Aug 2019 13:16:54 +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         | 30 ++++++++++++++----------------
 web/controllers/api/Food.py |  3 ++-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ccb1a59..74e2d58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/index.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/index.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/index.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/index.wxss" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/info.js" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/info.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/info.wxml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/mina/pages/food/info.wxss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mina/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/mina/app.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -60,8 +52,8 @@
       <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="465">
-              <caret line="40" column="62" selection-start-line="40" selection-start-column="62" selection-end-line="40" selection-end-column="62" />
+            <state relative-caret-position="403">
+              <caret line="38" column="29" lean-forward="true" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -194,9 +186,9 @@
         <option value="$PROJECT_DIR$/mina/app.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" />
         <option value="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" />
         <option value="$PROJECT_DIR$/mina/app.json" />
+        <option value="$PROJECT_DIR$/web/controllers/api/Food.py" />
       </list>
     </option>
   </component>
@@ -684,7 +676,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566360389567</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="python学习">
+      <created>1566364356789</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1566364356789</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TodoView">
@@ -698,7 +697,6 @@
   </component>
   <component name="ToolWindowManager">
     <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.20706007" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -953,8 +951,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="40" column="62" selection-start-line="40" selection-start-column="62" selection-end-line="40" selection-end-column="62" />
+        <state relative-caret-position="403">
+          <caret line="38" column="29" lean-forward="true" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" />
         </state>
       </provider>
     </entry>
diff --git a/web/controllers/api/Food.py b/web/controllers/api/Food.py
index ccd94f4..23100cd 100644
--- a/web/controllers/api/Food.py
+++ b/web/controllers/api/Food.py
@@ -77,7 +77,8 @@ def foodSearch():
                 'name': "%s"%( item.name ),
                 'price': str( item.price ),
                 'min_price':str( item.price ),
-                'pic_url': UrlManager.buildImageUrl(item.main_image)
+                # 'pic_url': UrlManager.buildImageUrl(item.main_image)
+                'pic_url': 'http://106.52.204.179:8999/static/upload/'+item.main_image
             }
             data_food_list.append(tmp_data)
     resp['data']['list'] = data_food_list