From 7e9a1ed8af69239855f894523c7ca5366b0e9d7d Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Wed, 21 Aug 2019 13:12:35 +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         | 271 +++++++++++++++++++++---------------
 mina                        |   2 +-
 web/controllers/api/Food.py |   2 +-
 3 files changed, 157 insertions(+), 118 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8eb7339..ccb1a59 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d564f57a-9f96-4262-9481-cacdf2b8445c" name="Default" comment="python学习">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/controllers/api/Food.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/controllers/api/Food.py" afterDir="false" />
+      <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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -14,19 +21,38 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
+        <entry file="file://$PROJECT_DIR$/mina/app.json">
           <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 relative-caret-position="62">
+              <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.js">
+        <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="22" column="31" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="31" />
+            <state relative-caret-position="505">
+              <caret line="299" column="27" selection-start-line="299" selection-start-column="20" selection-end-line="299" selection-end-column="27" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/mina/pages/food/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/shangpin/index.wxml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="124">
+              <caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
             </state>
           </provider>
         </entry>
@@ -34,49 +60,36 @@
       <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="558">
+            <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>
           </provider>
         </entry>
       </file>
       <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">
-              <caret line="21" column="38" lean-forward="true" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="40" />
-            </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="341">
-              <caret line="11" column="6" lean-forward="true" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/local_setting.py">
+        <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="false">
-        <entry file="file://$PROJECT_DIR$/config/base_setting.py">
+        <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.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/posts/post-detail/post-detail.wxml">
           <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 relative-caret-position="93">
+              <caret line="3" column="105" lean-forward="true" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="105" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/production_setting.py">
+        <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.wxml">
           <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 relative-caret-position="62">
+              <caret line="2" column="100" selection-start-line="2" selection-start-column="100" selection-end-line="2" selection-end-column="100" />
             </state>
           </provider>
         </entry>
@@ -118,10 +131,10 @@
       <find>area</find>
       <find>page-body-button</find>
       <find>/food/index</find>
-      <find>getBannerAndCat</find>
       <find>事件处理函数</find>
       <find>toSearch</find>
       <find>getFoodList</find>
+      <find>getBannerAndCat</find>
     </findStrings>
     <replaceStrings>
       <replace>ops_render</replace>
@@ -178,12 +191,12 @@
         <option value="$PROJECT_DIR$/mina/pages/posts/post.json" />
         <option value="$PROJECT_DIR$/mina/pages/shangpin/index.json" />
         <option value="$PROJECT_DIR$/mina/pages/sdindex/index.wxml" />
-        <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$/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" />
       </list>
     </option>
   </component>
@@ -196,9 +209,9 @@
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="782" />
-    <option name="y" value="5" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="709" />
+    <option name="y" value="46" />
     <option name="width" value="947" />
     <option name="height" value="1028" />
   </component>
@@ -236,6 +249,13 @@
               <item name="mina" 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="mina" type="462c0819:PsiDirectoryNode" />
+              <item name="pages" type="462c0819:PsiDirectoryNode" />
+              <item name="food" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
               <item name="order" type="462c0819:PsiDirectoryNode" />
@@ -243,6 +263,21 @@
               <item name="pages" type="462c0819:PsiDirectoryNode" />
               <item name="posts" 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="posts" type="462c0819:PsiDirectoryNode" />
+              <item name="post-detail" 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="sdindex" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="order" type="b2602c69:ProjectViewProjectNode" />
               <item name="order" type="462c0819:PsiDirectoryNode" />
@@ -317,12 +352,6 @@
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
-    <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" />
       <recent name="D:\order\mina\pages\shangpin" />
@@ -330,6 +359,12 @@
       <recent name="D:\order\mina\images" />
       <recent name="D:\order\mina\images\nav" />
     </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>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -642,7 +677,14 @@
       <option name="project" value="LOCAL" />
       <updated>1566358209074</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="python学习">
+      <created>1566360389567</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1566360389567</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TodoView">
@@ -655,9 +697,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="782" y="5" width="947" height="1028" extended-state="0" />
+    <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.43234324" />
+      <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" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info id="Project Explorer" order="3" />
@@ -696,40 +739,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="python学习" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/mina/pages/location/index.wxss" />
-    <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="-305" />
-      </provider>
-    </entry>
-    <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>
-    <entry file="file://$PROJECT_DIR$/mina/pages/index/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <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>
@@ -758,12 +767,6 @@
     <entry file="file://$PROJECT_DIR$/mina/pages/location/index.json" />
     <entry file="file://$PROJECT_DIR$/mina/pages/location/index.js" />
     <entry file="file://$PROJECT_DIR$/mina/pages/order/index.wxml" />
-    <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/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>
@@ -807,13 +810,6 @@
     <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.wxss">
       <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="1457">
-          <caret line="47" column="8" selection-start-line="47" selection-start-column="8" selection-end-line="47" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/web/controllers/api/Jieshao.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="651">
@@ -828,19 +824,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.json">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="62">
-          <caret line="2" column="100" selection-start-line="2" selection-start-column="100" selection-end-line="2" selection-end-column="100" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="246">
@@ -848,13 +834,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/index.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="28" selection-start-line="28" selection-end-line="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/mina/app.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="341">
@@ -905,16 +884,76 @@
         </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/pages/shangpin/index.wxss">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="62">
+          <caret line="2" column="100" selection-start-line="2" selection-start-column="100" selection-end-line="2" selection-end-column="100" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post.wxml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/posts/post-detail/post-detail.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="93">
+          <caret line="3" column="105" lean-forward="true" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="105" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="32" column="35" lean-forward="true" selection-start-line="32" selection-start-column="35" selection-end-line="32" selection-end-column="35" />
+        </state>
+      </provider>
+    </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/index.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="124">
+          <caret line="4" column="33" selection-start-line="4" selection-start-column="33" selection-end-line="4" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/shangpin/food/info.js">
+      <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="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 relative-caret-position="505">
+          <caret line="299" column="27" selection-start-line="299" selection-start-column="20" selection-end-line="299" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/info.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/mina/pages/food/index.wxml">
+      <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="62">
+          <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
         </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">
+        <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>
       </provider>
diff --git a/mina b/mina
index 1853724..9e317ce 160000
--- a/mina
+++ b/mina
@@ -1 +1 @@
-Subproject commit 18537249d594373edaf318014a7dc71fc5f32bba
+Subproject commit 9e317ce2160e1ac1f2ce8ead8dd76f01d9aadacc
diff --git a/web/controllers/api/Food.py b/web/controllers/api/Food.py
index 7e4ae14..ccd94f4 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/static/upload/'+item.main_image
+                'pic_url': 'http://106.52.204.179:8999/static/upload/'+item.main_image
             }
             data_food_list.append( tmp_data )