Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
Pai2
/
pai2
Obserwuj 2
Polub 0
Fork 0

Przeglądaj źródła
Move page relative urls from pai2/urls.py to page/urls.py

Brightcells 7 lat temu
rodzic
ac03876ce1
commit
34aac5d903
6 zmienionych plików z 98 dodań i 82 usunięć
Pokaż statystyki zmian
  1. 49 0
      page/oauth_views.py
  2. 15 0
      page/page_views.py
  3. 1 1
      page/templates/page/login_qrcode.html
  4. 30 0
      page/urls.py
  5. 1 56
      page/views.py
  6. 2 25
      pai2/urls.py

+ 49 - 0
page/oauth_views.py
Wyświetl plik 

@@ -0,0 +1,49 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+import json
4 
+
5 
+from django.shortcuts import render
6 
+
7 
+from account.models import LensmanInfo, TourGuideInfo
8 
+from utils.redis.connect import r
9 
+
10 
+
11 
+def lensman_oauth(request):
12 
+    unionid = request.GET.get('unionid', '')
13 
+
14 
+    try:
15 
+        lensman = LensmanInfo.objects.get(unionid=unionid)
16 
+    except LensmanInfo.DoesNotExist:
17 
+        lensman = None
18 
+
19 
+    return render(request, 'page/lensman_oauth.html', {
20 
+        'lensman_info': lensman and lensman.data,
21 
+        'modified': bool((not lensman) or (lensman and lensman.user_status in [LensmanInfo.UNVERIFIED, LensmanInfo.REFUSED])),  # 是否可以更改信息
22 
+    })
23 
+
24 
+
25 
+def tourguide_oauth(request):
26 
+    unionid = request.GET.get('unionid', '')
27 
+
28 
+    try:
29 
+        tourguide = TourGuideInfo.objects.get(unionid=unionid)
30 
+    except TourGuideInfo.DoesNotExist:
31 
+        tourguide = None
32 
+
33 
+    return render(request, 'page/tourguide_oauth.html', {
34 
+        'tourguide_info': tourguide and tourguide.data,
35 
+        'modified': bool((not tourguide) or (tourguide and tourguide.user_status in [TourGuideInfo.UNVERIFIED, TourGuideInfo.REFUSED])),  # 是否可以更改信息
36 
+    })
37 
+
38 
+
39 
+def login_qrcode(request):
40 
+    unionid = request.GET.get('unionid', '')
41 
+
42 
+    data = {
43 
+        'unionid': unionid,
44 
+        'token': r.token(unionid)
45 
+    }
46 
+
47 
+    return render(request, 'page/login_qrcode.html', {
48 
+        'data': json.dumps(data)
49 
+    })

+ 15 - 0
page/page_views.py
Wyświetl plik 

@@ -0,0 +1,15 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+from django.shortcuts import render
4 
+
5 
+
6 
+def user_agreement(request):
7 
+    return render(request, 'page/user_agreement.html', {})
8 
+
9 
+
10 
+def contact_us(request):
11 
+    return render(request, 'page/contact_us.html', {})
12 
+
13 
+
14 
+def lensman_price(request):
15 
+    return render(request, 'page/lensman_price.html', {})

+ 1 - 1
page/templates/page/login_qrcode.html
Wyświetl plik 

@@ -7,7 +7,7 @@
7 7 
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
8 8 
         <meta name="format-detection" content="telephone=no,email=no,address=no">
9 9 
         <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
10 
-        <title>摄影师授权</title>
10 
+        <title>授权登录二维码</title>
11 11
12 12 
         <link href="https://res.wx.qq.com/open/libs/weui/0.4.3/weui.min.css" rel="stylesheet" type="text/css" />
13 13

+ 30 - 0
page/urls.py
Wyświetl plik 

@@ -0,0 +1,30 @@
1 
+# -*- coding: utf-8 -*-
2 
+
3 
+from django.conf.urls import url
4 
+
5 
+from account import tourguide_views
6 
+from group import lensman_views
7 
+from page import oauth_views, page_views
8 
+
9 
+
10 
+urlpatterns = [
11 
+    url(r'^page/user_agreement$', page_views.user_agreement, name='user_agreement'),  # 用户协议页面
12 
+    url(r'^page/contact_us$', page_views.contact_us, name='contact_us'),  # 联系我们页面
13 
+    url(r'^page/price$', page_views.lensman_price, name='lensman_price'),  # 摄影师照片价格和分成规则
14 
+]
15 
+
16 
+urlpatterns += [
17 
+    url(r'^page/lensman$', oauth_views.lensman_oauth, name='lensman_oauth'),  # 摄影师授权页面
18 
+    url(r'^page/tourguide$', oauth_views.tourguide_oauth, name='tourguide_oauth'),  # 导游授权页面
19 
+    url(r'^page/loginqr$', oauth_views.login_qrcode, name='login_qrcode'),  # 登录二维码页面
20 
+]
21 
+
22 
+# 摄影师相关
23 
+urlpatterns += [
24 
+    url(r'^page/l/submit$', lensman_views.lensman_submit_api, name='lensman_submit_api'),  # 摄影师信息提交
25 
+]
26 
+
27 
+# 导游相关
28 
+urlpatterns += [
29 
+    url(r'^page/t/submit$', tourguide_views.tourguide_submit_api, name='tourguide_submit_api'),  # 导游信息提交
30 
+]

+ 1 - 56
page/views.py
Wyświetl plik 

@@ -1,59 +1,4 @@
1 
-# -*- coding: utf-8 -*-
2 
-
3 
-import json
4 
-
5 1 
 from django.shortcuts import render
6 2
7 
-from account.models import LensmanInfo, TourGuideInfo
8 
-from utils.redis.connect import r
9 
-
10 
-
11 
-def user_agreement(request):
12 
-    return render(request, 'page/user_agreement.html', {})
13 
-
14 
-
15 
-def contact_us(request):
16 
-    return render(request, 'page/contact_us.html', {})
17 
-
18 
-
19 
-def lensman_oauth(request):
20 
-    unionid = request.GET.get('unionid', '')
21 
-
22 
-    try:
23 
-        lensman = LensmanInfo.objects.get(unionid=unionid)
24 
-    except LensmanInfo.DoesNotExist:
25 
-        lensman = None
26 
-
27 
-    return render(request, 'page/lensman_oauth.html', {
28 
-        'lensman_info': lensman and lensman.data,
29 
-        'modified': bool((not lensman) or (lensman and lensman.user_status in [LensmanInfo.UNVERIFIED, LensmanInfo.REFUSED])),  # 是否可以更改信息
30 
-    })
31 
-
32 
-
33 
-def lensman_price(request):
34 
-    return render(request, 'page/lensman_price.html', {})
35 
-
36 
-
37 
-def tourguide_oauth(request):
38 
-    unionid = request.GET.get('unionid', '')
39 
-
40 
-    try:
41 
-        tourguide = TourGuideInfo.objects.get(unionid=unionid)
42 
-    except TourGuideInfo.DoesNotExist:
43 
-        tourguide = None
44 
-
45 
-    return render(request, 'page/tourguide_oauth.html', {
46 
-        'tourguide_info': tourguide and tourguide.data,
47 
-        'modified': bool((not tourguide) or (tourguide and tourguide.user_status in [TourGuideInfo.UNVERIFIED, TourGuideInfo.REFUSED])),  # 是否可以更改信息
48 
-    })
49 
-
50 3
51 
-def login_qrcode(request):
52 
-    unionid = request.GET.get('unionid', '')
53 
-    data = {
54 
-        'unionid': unionid,
55 
-        'token': r.token(unionid)
56 
-    }
57 
-    return render(request, 'page/login_qrcode.html', {
58 
-        'data': json.dumps(data)
59 
-    })
4 
+# Create your views here.

+ 2 - 25
pai2/urls.py
Wyświetl plik 

@@ -22,11 +22,9 @@ from django.contrib import admin
22 22 
 from rest_framework import routers
23 23
24 24 
 from account import views as account_views
25 
-from account import tourguide_views
26 25 
 from group import views as group_views
27 
-from group import grouppage_views, lensman_views
26 
+from group import grouppage_views
28 27 
 from miniapp import views as mini_views
29 
-from page import views as page_views
30 28 
 from photo import views as photo_views
31 29 
 from website import views as website_views
32 30 
 
@@ -74,18 +72,6 @@ urlpatterns += [
74 72 
 ]
75 73
76 74 
 urlpatterns += [
77 
-    url(r'^page/user_agreement$', page_views.user_agreement, name='user_agreement'),  # 用户协议页面
78 
-    url(r'^page/contact_us$', page_views.contact_us, name='contact_us'),  # 联系我们页面
79 
-
80 
-    url(r'^page/lensman$', page_views.lensman_oauth, name='lensman_oauth'),  # 摄影师授权页面
81 
-    url(r'^page/price$', page_views.lensman_price, name='lensman_price'),  # 摄影师照片价格和分成规则
82 
-
83 
-    url(r'^page/tourguide$', page_views.tourguide_oauth, name='tourguide_oauth'),  # 导游授权页面
84 
-
85 
-    url(r'^page/loginqr$', page_views.login_qrcode, name='login_qrcode'),  # 登录二维码页面
86 
-]
87 
-
88 
-urlpatterns += [
89 75 
     url(r'^$', website_views.pai2_home, name='pai2_home'),  # 官网首页
90 76 
     url(r'^aboutus$', website_views.pai2_aboutus, name='pai2_aboutus'),  # 官网关于我们
91 77 
     url(r'^contactus$', website_views.pai2_contactus, name='pai2_contactus'),  # 官网联系我们
 
@@ -93,16 +79,6 @@ urlpatterns += [
93 79 
     url(r'^termofservice$', website_views.pai2_termofservice, name='pai2_termofservice'),  # 官网服务条款
94 80 
 ]
95 81
96 
-# 摄影师相关
97 
-urlpatterns += [
98 
-    url(r'^page/l/submit$', lensman_views.lensman_submit_api, name='lensman_submit_api'),  # 摄影师信息提交
99 
-]
100 
-
101 
-# 导游相关
102 
-urlpatterns += [
103 
-    url(r'^page/t/submit$', tourguide_views.tourguide_submit_api, name='tourguide_submit_api'),  # 导游信息提交
104 
-]
105 
-
106 82 
 # Mini App
107 83 
 urlpatterns += [
108 84 
     url(r'^mini/userinfo$', mini_views.get_userinfo_api, name='get_userinfo_api2'),  # 获取用户信息
 
@@ -112,6 +88,7 @@ urlpatterns += [
112 88 
 # Additionally, we include login URLs for the browsable API.
113 89 
 urlpatterns += [
114 90 
     url(r'^api/', include(router.urls)),
91 
+    url(r'^page/', include('page.urls', namespace='page')),
115 92 
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
116 93 
 ]
117 94