diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 74e2d58..cb554b4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,9 @@
+
+
+
@@ -52,40 +55,44 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -167,7 +174,6 @@
-
@@ -184,10 +190,11 @@
-
+
+
@@ -202,8 +209,8 @@
-
-
+
+
@@ -225,6 +232,12 @@
+
+
+
+
+
+
@@ -683,7 +696,14 @@
1566364356789
-
+
+ 1566364615164
+
+
+
+ 1566364615164
+
+
@@ -839,21 +859,11 @@
-
-
-
-
-
-
-
-
-
-
@@ -861,27 +871,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -949,10 +938,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/config/base_setting.py b/config/base_setting.py
index 11e055b..d793ba1 100644
--- a/config/base_setting.py
+++ b/config/base_setting.py
@@ -43,10 +43,9 @@ UPLOAD = {
}
APP = {
- 'domain':'http://127.0.0.1:8999'
+ 'domain':'http://106.52.204.179:8999'
}
-
PAY_STATUS_MAPPING = {
"1":"已支付",
"-8":"待支付",
diff --git a/config/production_setting.py b/config/production_setting.py
index 01ba944..2d5908e 100644
--- a/config/production_setting.py
+++ b/config/production_setting.py
@@ -7,6 +7,6 @@ SQLALCHEMY_ENCODING = "utf8mb4"
APP = {
- 'domain': '106.52.204.179:8999'
+ 'domain': 'http://106.52.204.179:8999'
}
RELEASE_VERSION="20180729001"
\ No newline at end of file
diff --git a/web/controllers/api/Food.py b/web/controllers/api/Food.py
index 23100cd..c82a149 100644
--- a/web/controllers/api/Food.py
+++ b/web/controllers/api/Food.py
@@ -37,8 +37,8 @@ def foodIndex():
for item in food_list:
tmp_data = {
'id':item.id,
- # 'pic_url':UrlManager.buildImageUrl( item.main_image )
- 'pic_url': 'http://106.52.204.179:8999/static/upload/'+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 )
@@ -77,8 +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': 'http://106.52.204.179:8999/static/upload/'+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