Change miniprogram urlpatterns position
Brightcells
4 измененных файлов с 19 добавлено и 19 удалено
+ 15
- 15
pai2/urls.py
@@ -46,6 +46,21 @@ urlpatterns = [ |
||
| 46 | 46 |
url(r'^pai2admin/', include(admin.site.urls)), |
| 47 | 47 |
] |
| 48 | 48 |
|
| 49 |
+# Mini App |
|
| 50 |
+urlpatterns += [ |
|
| 51 |
+ url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'), # 首页照片信息 |
|
| 52 |
+ |
|
| 53 |
+ url(r'^mini/userinfo$', mini_views.get_userinfo_api, name='get_userinfo_api2'), # 获取用户信息 |
|
| 54 |
+ url(r'^mini/order_create$', pay_views.wx_order_create_api, name='wx_order_create_api'), # 订单创建 |
|
| 55 |
+ url(r'^mini/order_query$', pay_views.wx_order_query_api, name='wx_order_query_api'), # 订单查询补单 |
|
| 56 |
+ |
|
| 57 |
+ url(r'^s/join$', photo_views.session_join_api, name='session_join_api'), # Session 加群 |
|
| 58 |
+ url(r'^g/join$', groupuser_views.group_user_join_api, name='group_join_api'), # 群成员加群 |
|
| 59 |
+ url(r'^tgu/join$', tourguidegroupuser_views.tgu_group_user_join_api, name='tgu_group_user_join_api'), # 旅行团成员加团 |
|
| 60 |
+ |
|
| 61 |
+ url(r'^f/bought$', group_views.lensman_photo_bought, name='lensman_photo_bought'), # 摄影师照片已购买 |
|
| 62 |
+] |
|
| 63 |
+ |
|
| 49 | 64 |
urlpatterns += [ |
| 50 | 65 |
# url(r'^api/', include('api.urls', namespace='api')),
|
| 51 | 66 |
url(r'^s/(?P<session_id>\w+)$', photo_views.session_detail, name='session_detail'), # Session 详情 |
@@ -75,21 +90,6 @@ urlpatterns += [ |
||
| 75 | 90 |
url(r'^$', website_views.pai2_home, name='pai2_home'), # 官网首页 |
| 76 | 91 |
] |
| 77 | 92 |
|
| 78 |
-# Mini App |
|
| 79 |
-urlpatterns += [ |
|
| 80 |
- url(r'^pai2/home$', group_views.pai2_home_api, name='pai2_home_api'), # 首页照片信息 |
|
| 81 |
- |
|
| 82 |
- url(r'^mini/userinfo$', mini_views.get_userinfo_api, name='get_userinfo_api2'), # 获取用户信息 |
|
| 83 |
- url(r'^mini/order_create$', pay_views.wx_order_create_api, name='wx_order_create_api'), # 订单创建 |
|
| 84 |
- url(r'^mini/order_query$', pay_views.wx_order_query_api, name='wx_order_query_api'), # 订单查询补单 |
|
| 85 |
- |
|
| 86 |
- url(r'^s/join$', photo_views.session_join_api, name='session_join_api'), # Session 加群 |
|
| 87 |
- url(r'^g/join$', groupuser_views.group_user_join_api, name='group_join_api'), # 群成员加群 |
|
| 88 |
- url(r'^tgu/join$', tourguidegroupuser_views.tgu_group_user_join_api, name='tgu_group_user_join_api'), # 旅行团成员加团 |
|
| 89 |
- |
|
| 90 |
- url(r'^f/bought$', group_views.lensman_photo_bought, name='lensman_photo_bought'), # 摄影师照片已购买 |
|
| 91 |
-] |
|
| 92 |
- |
|
| 93 | 93 |
# Wire up our API using automatic URL routing. |
| 94 | 94 |
# Additionally, we include login URLs for the browsable API. |
| 95 | 95 |
urlpatterns += [ |
+ 1
- 1
requirements.txt
@@ -4,7 +4,7 @@ Pillow==5.0.0 |
||
| 4 | 4 |
StatusCode==1.0.0 |
| 5 | 5 |
TimeConvert==1.4.3 |
| 6 | 6 |
cryptography==1.5.2 |
| 7 |
-furl==1.2.1 |
|
| 7 |
+furl==2.0.0 |
|
| 8 | 8 |
isoweek==1.3.3 |
| 9 | 9 |
jsonfield==2.0.2 |
| 10 | 10 |
mock==2.0.0 |
+ 2
- 2
requirements_dj.txt
@@ -1,8 +1,8 @@ |
||
| 1 | 1 |
Django==1.11.15 |
| 2 | 2 |
django-admin==1.3.2 |
| 3 |
-django-cors-headers==2.3.0 |
|
| 3 |
+django-cors-headers==2.4.0 |
|
| 4 | 4 |
django-curtail-uuid==1.0.4 |
| 5 |
-django-detect==1.0.5 |
|
| 5 |
+django-detect==1.0.6 |
|
| 6 | 6 |
django-file==1.0.3 |
| 7 | 7 |
django-ip==1.0.2 |
| 8 | 8 |
django-json-render==1.0.1 |
+ 1
- 1
requirements_pywe.txt
@@ -1,6 +1,6 @@ |
||
| 1 | 1 |
pywe-jssdk==1.1.0 |
| 2 | 2 |
pywe-membercard==1.0.0 |
| 3 |
-pywe-miniapp==1.1.4 |
|
| 3 |
+pywe-miniapp==1.1.5 |
|
| 4 | 4 |
pywe-oauth==1.0.6 |
| 5 | 5 |
pywe-pay==1.0.12 |
| 6 | 6 |
pywe-pay-notify==1.0.4 |