admin/order
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python学习

Browse Source
This commit is contained in:
jianbo
2019-08-21 13:24:46 +08:00
parent c50eb851ad
commit 6cbc39f4f2
4 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
.idea/workspace.xml generated
View File

@@ -3,6 +3,9 @@
<component name="ChangeListManager"> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/base_setting.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/base_setting.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/production_setting.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/production_setting.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/web/controllers/api/Food.py" beforeDir="false" afterPath="$PROJECT_DIR$/web/controllers/api/Food.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@@ -52,40 +55,44 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py"> <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403"> <state relative-caret-position="248">
<caret line="38" column="29" lean-forward="true" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" /> <caret line="39" column="16" lean-forward="true" selection-start-line="39" selection-start-column="16" selection-end-line="39" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/pages/shangpin/info.wxml"> <entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
<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.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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="93"> <state relative-caret-position="589">
<caret line="3" column="105" lean-forward="true" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="105" /> <caret line="20" column="24" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mina/pages/sdindex/index.wxml"> <entry file="file://$PROJECT_DIR$/config/base_setting.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="62"> <state relative-caret-position="532">
<caret line="2" column="100" selection-start-line="2" selection-start-column="100" selection-end-line="2" selection-end-column="100" /> <caret line="45" column="41" lean-forward="true" selection-start-line="45" selection-end-line="45" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </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="248">
<caret line="8" column="7" lean-forward="true" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/local_setting.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@@ -167,7 +174,6 @@
<option value="$PROJECT_DIR$/config/local_setting.py" /> <option value="$PROJECT_DIR$/config/local_setting.py" />
<option value="$PROJECT_DIR$/requirements.txt" /> <option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/common/models/__init__.py" /> <option value="$PROJECT_DIR$/common/models/__init__.py" />
<option value="$PROJECT_DIR$/config/base_setting.py" />
<option value="$PROJECT_DIR$/mina/utils/util.js" /> <option value="$PROJECT_DIR$/mina/utils/util.js" />
<option value="$PROJECT_DIR$/mina/pages/index/index.js" /> <option value="$PROJECT_DIR$/mina/pages/index/index.js" />
<option value="$PROJECT_DIR$/mina/pages/index/index.wxml" /> <option value="$PROJECT_DIR$/mina/pages/index/index.wxml" />
@@ -184,10 +190,11 @@
<option value="$PROJECT_DIR$/mina/pages/shangpin/index.json" /> <option value="$PROJECT_DIR$/mina/pages/shangpin/index.json" />
<option value="$PROJECT_DIR$/mina/pages/sdindex/index.wxml" /> <option value="$PROJECT_DIR$/mina/pages/sdindex/index.wxml" />
<option value="$PROJECT_DIR$/mina/app.js" /> <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$/mina/pages/shangpin/index.js" />
<option value="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" /> <option value="$PROJECT_DIR$/mina/pages/shangpin/index.wxml" />
<option value="$PROJECT_DIR$/mina/app.json" /> <option value="$PROJECT_DIR$/mina/app.json" />
<option value="$PROJECT_DIR$/config/base_setting.py" />
<option value="$PROJECT_DIR$/config/production_setting.py" />
<option value="$PROJECT_DIR$/web/controllers/api/Food.py" /> <option value="$PROJECT_DIR$/web/controllers/api/Food.py" />
</list> </list>
</option> </option>
@@ -202,8 +209,8 @@
<packageJsonPaths /> <packageJsonPaths />
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="709" /> <option name="x" value="1048" />
<option name="y" value="46" /> <option name="y" value="85" />
<option name="width" value="947" /> <option name="width" value="947" />
<option name="height" value="1028" /> <option name="height" value="1028" />
</component> </component>
@@ -225,6 +232,12 @@
<item name="order" type="462c0819:PsiDirectoryNode" /> <item name="order" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" /> <item name="common" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="order" type="b2602c69:ProjectViewProjectNode" />
<item name="order" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="libs" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="order" type="b2602c69:ProjectViewProjectNode" /> <item name="order" type="b2602c69:ProjectViewProjectNode" />
<item name="order" type="462c0819:PsiDirectoryNode" /> <item name="order" type="462c0819:PsiDirectoryNode" />
@@ -683,7 +696,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1566364356789</updated> <updated>1566364356789</updated>
</task> </task>
<option name="localTasksCounter" value="44" /> <task id="LOCAL-00044" summary="python学习">
<created>1566364615164</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1566364615164</updated>
</task>
<option name="localTasksCounter" value="45" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
@@ -839,21 +859,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/local_setting.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/web/controllers/food/Food.py"> <entry file="file://$PROJECT_DIR$/web/controllers/food/Food.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-186" /> <state relative-caret-position="-186" />
</provider> </provider>
</entry> </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">
<caret line="437" column="13" selection-start-line="437" selection-start-column="13" selection-end-line="437" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application.py"> <entry file="file://$PROJECT_DIR$/application.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372"> <state relative-caret-position="372">
@@ -861,27 +871,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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>
<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/kefuindex/index.wxml"> <entry file="file://$PROJECT_DIR$/mina/pages/kefuindex/index.wxml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1612"> <state relative-caret-position="1612">
@@ -949,10 +938,41 @@
</state> </state>
</provider> </provider>
</entry> </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="299">
<caret line="437" column="13" selection-start-line="437" selection-start-column="13" selection-end-line="437" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/libs/UrlManager.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="20" column="24" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/local_setting.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/config/base_setting.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="45" column="41" lean-forward="true" selection-start-line="45" selection-end-line="45" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/production_setting.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="8" column="7" lean-forward="true" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py"> <entry file="file://$PROJECT_DIR$/web/controllers/api/Food.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403"> <state relative-caret-position="248">
<caret line="38" column="29" lean-forward="true" selection-start-line="38" selection-start-column="29" selection-end-line="38" selection-end-column="29" /> <caret line="39" column="16" lean-forward="true" selection-start-line="39" selection-start-column="16" selection-end-line="39" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>

3
config/base_setting.py
View File

@@ -43,10 +43,9 @@ UPLOAD = {
} }
APP = { APP = {
'domain':'http://127.0.0.1:8999' 'domain':'http://106.52.204.179:8999'
} }
PAY_STATUS_MAPPING = { PAY_STATUS_MAPPING = {
"1":"已支付", "1":"已支付",
"-8":"待支付", "-8":"待支付",

2
config/production_setting.py
View File

@@ -7,6 +7,6 @@ SQLALCHEMY_ENCODING = "utf8mb4"
APP = { APP = {
'domain': '106.52.204.179:8999' 'domain': 'http://106.52.204.179:8999'
} }
RELEASE_VERSION="20180729001" RELEASE_VERSION="20180729001"

8
web/controllers/api/Food.py
View File

@@ -37,8 +37,8 @@ def foodIndex():
for item in food_list: for item in food_list:
tmp_data = { tmp_data = {
'id':item.id, 'id':item.id,
# '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 # 'pic_url': 'http://106.52.204.179:8999/static/upload/'+item.main_image
} }
data_food_list.append( tmp_data ) data_food_list.append( tmp_data )
@@ -77,8 +77,8 @@ def foodSearch():
'name': "%s"%( item.name ), 'name': "%s"%( item.name ),
'price': str( item.price ), 'price': str( item.price ),
'min_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 # 'pic_url': 'http://106.52.204.179:8999/static/upload/'+item.main_image
} }
data_food_list.append(tmp_data) data_food_list.append(tmp_data)
resp['data']['list'] = data_food_list resp['data']['list'] = data_food_list