urlpatterns += [
46 52
     url(r'^g/create$', group_views.group_create_api, name='group_create_api'),  # 群组创建

+ 213 - 0
page/templates/page/tourguide_oauth.html

@@ -0,0 +1,213 @@
1
+{% load staticfiles %}
2
+
3
+<!DOCTYPE html>
4
+<html lang="zh-CN">
5
+    <head>
6
+        <meta charset="utf-8">
7
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
8
+        <meta name="format-detection" content="telephone=no,email=no,address=no">
9
+        <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
10
+        <title>导游授权</title>
11
+
12
+        <link href="https://res.wx.qq.com/open/libs/weui/0.4.3/weui.min.css" rel="stylesheet" type="text/css" />
13
+
14
+        <style>
15
+            input:required:invalid {
16
+                color: #E64340;
17
+            }
18
+            input:required:valid {
19
+                color: rgb(0, 0, 0);
20
+            }
21
+        </style>
22
+    </head>
23
+    <body>
24
+        <div class="container" >
25
+            <div class="weui_cells_title">基本信息</div>
26
+            <div class="weui_cells weui_cells_form">
27
+                <div class="weui_cell">
28
+                    <div class="weui_cell_hd"><label for="" class="weui_label">姓名</label></div>
29
+                    <div class="weui_cell_bd weui_cell_primary">
30
+                        <input id="name" class="weui_input" type="text" value="{{ tourguide_info.name }}" placeholder="请输入姓名" {% if not modified %}disabled{% endif %}>
31
+                    </div>
32
+                </div>
33
+                <div class="weui_cell weui_cell_select weui_select_after">
34
+                    <div class="weui_cell_hd"><label for="" class="weui_label">性别</label></div>
35
+                    <div class="weui_cell_bd weui_cell_primary">
36
+                        <select id="sex" class="weui_select" name="select" {% if not modified %}disabled{% endif %}>
37
+                            <option value="1" {% ifequal tourguide_info.sex 1 %}selected{% endifequal %}>男</option>
38
+                            <option value="0" {% ifequal tourguide_info.sex 0 %}selected{% endifequal %}>女</option>
39
+                        </select>
40
+                    </div>
41
+                </div>
42
+                <div class="weui_cell">
43
+                    <div class="weui_cell_hd"><label for="" class="weui_label">手机号</label></div>
44
+                    <div class="weui_cell_bd weui_cell_primary">
45
+                        <input id="phone" class="weui_input" type="text" required="required" pattern="[0-9]{11}" value="{{ tourguide_info.phone }}" placeholder="请输入手机号" {% if not modified %}disabled{% endif %}>
46
+                    </div>
47
+                </div>
48
+{#                <div class="weui_cell">#}
49
+{#                    <div class="weui_cell_hd"><label for="" class="weui_label">地址</label></div>#}
50
+{#                    <div class="weui_cell_bd weui_cell_primary">#}
51
+{#                        <input id="location" class="weui_input" type="text" value="{{ tourguide_info.location }}" placeholder="请输入地址" {% if not modified %}disabled{% endif %}>#}
52
+{#                    </div>#}
53
+{#                </div>#}
54
+                <div class="weui_cell">
55
+                    <div class="weui_cell_hd"><label for="" class="weui_label">导游证编号</label></div>
56
+                    <div class="weui_cell_bd weui_cell_primary">
57
+                        <input id="no" class="weui_input" type="text" required="required" value="{{ tourguide_info.no }}" placeholder="请输入导游证编号" {% if not modified %}disabled{% endif %}>
58
+                    </div>
59
+                </div>
60
+            </div>
61
+
62
+            {% if tourguide_info %}
63
+            <div class="weui_cells_title">审核状态</div>
64
+            <div class="weui_cells">
65
+                <div class="weui_cell">
66
+                    <div class="weui_cell_bd weui_cell_primary">
67
+                        <p>状态</p>
68
+                    </div>
69
+                    <div class="weui_cell_ft">
70
+                        {% ifequal tourguide_info.status -1 %}已拒绝{% endifequal %}
71
+                        {% ifequal tourguide_info.status 0 %}审核中{% endifequal %}
72
+                        {% ifequal tourguide_info.status 1 %}已激活{% endifequal %}
73
+                        {% ifequal tourguide_info.status 2 %}已禁用{% endifequal %}
74
+                        {% ifequal tourguide_info.status 3 %}已删除{% endifequal %}
75
+                    </div>
76
+                </div>
77
+            </div>
78
+            {% endif %}
79
+
80
+
81
+            {% ifequal tourguide_info.status -1 %}
82
+            <div class="weui_cells_title">拒绝原因</div>
83
+            <div class="weui_cells">
84
+                <div class="weui_panel_bd">
85
+                    <div class="weui_media_box weui_media_text">
86
+                        <p class="weui_media_desc">{{ tourguide_info.refused_reason|safe|linebreaks }}</p>
87
+                    </div>
88
+                </div>
89
+            </div>
90
+            {% endifequal %}
91
+
92
+            <br>
93
+
94
+            {% if modified %}<button id="submit" class="weui_btn weui_btn_warn">确认</button>{% endif %}
95
+
96
+            <div class="weui_dialog_alert" id="dialog" style="display: none">
97
+                <div class="weui_mask"></div>
98
+                <div class="weui_dialog">
99
+                    <div class="weui_dialog_hd"><strong id="title" class="weui_dialog_title">弹窗标题</strong></div>
100
+                    <div id="content" class="weui_dialog_bd">弹窗内容,告知当前页面信息等</div>
101
+                    <div class="weui_dialog_ft">
102
+                        <a href="javascript:;" class="weui_btn_dialog primary">确定</a>
103
+                    </div>
104
+                </div>
105
+            </div>
106
+
107
+            <div id="toast" style="display: none;">
108
+                <div class="weui_mask_transparent"></div>
109
+                <div class="weui_toast">
110
+                    <i class="weui_icon_toast"></i>
111
+                    <p class="weui_toast_content">已完成</p>
112
+                </div>
113
+            </div>
114
+        </div>
115
+
116
+        <script src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script>
117
+        <script>
118
+            {% if modified %}
119
+            $(function() {
120
+                function getURLParameter(name) {
121
+                  return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search) || [null, ''])[1].replace(/\+/g, '%20')) || null;
122
+                }
123
+
124
+                function show_error_dialog(title, content) {
125
+                    $('#dialog #title').text(title);
126
+                    $('#dialog #content').text(content);
127
+                    $('#dialog').show();
128
+                }
129
+
130
+                function data_check() {
131
+                    var unionid = getURLParameter('unionid');
132
+                    if (!unionid) {
133
+                        show_error_dialog('微信授权', '微信授权失败,请重新打开页面');
134
+                        return false;
135
+                    }
136
+
137
+                    var name = $('#name').val();
138
+                    if (!name) {
139
+                        show_error_dialog('姓名', '姓名错误,请检查重新输入');
140
+                        return false;
141
+                    }
142
+
143
+                    var phone_valid = $('#phone').is(':valid');
144
+                    if (!phone_valid) {
145
+                        show_error_dialog('手机号', '手机号错误,请检查重新输入');
146
+                        return false;
147
+                    }
148
+
149
+{#                    var location = $('#location').val();#}
150
+{#                    if (!location) {#}
151
+{#                        show_error_dialog('地址', '地址错误,请检查重新输入');#}
152
+{#                        return false;#}
153
+{#                    }#}
154
+
155
+                    var no = $('#no').val();
156
+                    if (!no) {
157
+                        show_error_dialog('编号', '导游证编号错误,请检查重新输入');
158
+                        return false;
159
+                    }
160
+
161
+                    return {
162
+                        unionid: unionid,
163
+                        openid: getURLParameter('openid'),
164
+                        name: name,
165
+                        sex: $('#sex option:checked').val(),
166
+                        phone: $('#phone').val(),
167
+{#                        location: location,#}
168
+                        no: no,
169
+                    }
170
+                }
171
+
172
+                $('#submit').click(function () {
173
+                    var check_result = data_check();
174
+                    if (check_result){
175
+                        $.ajax({
176
+                            type: 'POST',
177
+                            url: 't/submit',
178
+                            data: check_result,
179
+                            success: function(data) {
180
+                                if (data.status == 200) {
181
+                                    $('#toast').show();
182
+                                    setTimeout(function () {
183
+                                        $('#toast').hide();
184
+                                    }, 1000);
185
+                                    window.location.reload();
186
+                                } else {
187
+                                    show_error_dialog('错误', data.description);
188
+                                }
189
+                            }
190
+                        })
191
+                    }
192
+                });
193
+
194
+                $('#dialog .weui_btn_dialog').click(function () {
195
+                    $('#dialog').hide();
196
+                })
197
+            });
198
+            {% endif %}
199
+        </script>
200
+        <script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
201
+        <script type="text/javascript" src="{% static 'pai2/js/jswe.js' %}?v=1"></script>
202
+        <script>
203
+            V.initWxData({
204
+                imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png",
205
+                link: 'http://api.pai.ai/wx_oauth2?redirect_url=http://pai.ai/page/tourguide&scope=snsapi_base',
206
+                desc: "导游授权",
207
+                title: "导游授权",
208
+                timeLine: ""
209
+            }, true);
210
+            V.hideOptionMenu();
211
+        </script>
212
+    </body>
213
+</html>

+ 15 - 1
page/views.py

@@ -2,7 +2,7 @@
2 2
 
3 3
 from django.shortcuts import render
4 4
 
5
-from account.models import LensmanInfo
5
+from account.models import LensmanInfo, TourGuideInfo
6 6
 
7 7
 
8 8
 def user_agreement(request):
@@ -29,3 +29,17 @@ def lensman_oauth(request):
29 29
 
30 30
 def lensman_price(request):
31 31
     return render(request, 'page/lensman_price.html', {})
32
+
33
+
34
+def tourguide_oauth(request):
35
+    unionid = request.GET.get('unionid', '')
36
+
37
+    try:
38
+        tourguide = TourGuideInfo.objects.get(unionid=unionid)
39
+    except TourGuideInfo.DoesNotExist:
40
+        tourguide = None
41
+
42
+    return render(request, 'page/tourguide_oauth.html', {
43
+        'tourguide_info': tourguide and tourguide.data,
44
+        'modified': bool((not tourguide) or (tourguide and tourguide.user_status in [TourGuideInfo.UNVERIFIED, TourGuideInfo.REFUSED])),  # 是否可以更改信息
45
+    })

+ 8 - 0
pai2/urls.py

@@ -22,6 +22,7 @@ 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
25 26
 from group import views as group_views
26 27
 from group import lensman_views
27 28
 from page import views as page_views
@@ -69,6 +70,8 @@ urlpatterns += [
69 70
 
70 71
     url(r'^page/lensman$', page_views.lensman_oauth, name='lensman_oauth'),  # 摄影师授权页面
71 72
     url(r'^page/price$', page_views.lensman_price, name='lensman_price'),  # 摄影师照片价格和分成规则
73
+
74
+    url(r'^page/tourguide$', page_views.tourguide_oauth, name='tourguide_oauth'),  # 导游授权页面
72 75
 ]
73 76
 
74 77
 urlpatterns += [
@@ -84,6 +87,11 @@ urlpatterns += [
84 87
     url(r'^page/l/submit$', lensman_views.lensman_submit_api, name='lensman_submit_api'),  # 摄影师信息提交
85 88
 ]
86 89
 
90
+# 导游相关
91
+urlpatterns += [
92
+    url(r'^page/t/submit$', tourguide_views.tourguide_submit_api, name='tourguide_submit_api'),  # 导游信息提交
93
+]
94
+
87 95
 # Wire up our API using automatic URL routing.
88 96
 # Additionally, we include login URLs for the browsable API.
89 97
 urlpatterns += [

+ 23 - 11
utils/error/errno_utils.py

@@ -15,25 +15,37 @@ class LensmanStatusCode(BaseStatusCode):
15 15
     LENSMAN_NOT_ACTIVATED = StatusCodeField(400015, u'Lensman Not Activated', description=u'摄影师帐号未激活')
16 16
 
17 17
 
18
+class TourGuideStatusCode(BaseStatusCode):
19
+    """ 导游相关错误码 4001xx """
20
+    TOURGUIDE_NOT_FOUND = StatusCodeField(400101, u'Tour Guide Not Found', description=u'导游不存在')
21
+    TOURGUIDE_PASSWORD_ERROR = StatusCodeField(400102, u'Tour Guide Password Error', description=u'导游密码错误')
22
+
23
+    TOURGUIDE_PHONE_ALREADY_EXISTS = StatusCodeField(400105, u'Tour Guide Phone Already Exists', description=u'手机号已经存在')
24
+
25
+    TOURGUIDE_ALREADY_NOT_UNVERIFIED = StatusCodeField(400110, u'Tour Guide Already Not Unverified', description=u'导游帐号已激活')
26
+
27
+    TOURGUIDE_NOT_ACTIVATED = StatusCodeField(400115, u'Tour Guide Not Activated', description=u'导游帐号未激活')
28
+
29
+
18 30
 class UserStatusCode(BaseStatusCode):
19
-    """ 用户相关错误码  4001xx """
20
-    USER_NOT_FOUND = StatusCodeField(400101, u'User Not Found', description=u'用户不存在')
21
-    USER_PASSWORD_ERROR = StatusCodeField(400102, u'User Password Error', description=u'用户密码错误')
22
-    USERNAME_HAS_REGISTERED = StatusCodeField(400103, u'Username Has Registered', description=u'用户名已注册')
31
+    """ 用户相关错误码  4005xx """
32
+    USER_NOT_FOUND = StatusCodeField(400501, u'User Not Found', description=u'用户不存在')
33
+    USER_PASSWORD_ERROR = StatusCodeField(400502, u'User Password Error', description=u'用户密码错误')
34
+    USERNAME_HAS_REGISTERED = StatusCodeField(400503, u'Username Has Registered', description=u'用户名已注册')
23 35
 
24
-    GUEST_NOT_ALLOWED = StatusCodeField(400111, u'Guest Not ALLOWED', description=u'游客登录未开启')
36
+    GUEST_NOT_ALLOWED = StatusCodeField(400511, u'Guest Not ALLOWED', description=u'游客登录未开启')
25 37
 
26 38
 
27 39
 class PhoneStatusCode(BaseStatusCode):
28
-    """ 手机相关错误码  4002xx """
29
-    PHONE_NOT_FOUND = StatusCodeField(400201, u'Phone Not Found', description=u'手机不存在')
40
+    """ 手机相关错误码  4006xx """
41
+    PHONE_NOT_FOUND = StatusCodeField(400601, u'Phone Not Found', description=u'手机不存在')
30 42
 
31 43
 
32 44
 class WechatStatusCode(BaseStatusCode):
33
-    """ 微信相关错误码  4003xx """
34
-    WECHAT_NOT_FOUND = StatusCodeField(400301, u'Wechat Not Found', description=u'微信不存在')
35
-    UNIONID_NOT_FOUND = StatusCodeField(400302, u'Unionid Not Found', description=u'微信 UNIONID 不存在')
36
-    OPENID_NOT_FOUND = StatusCodeField(400303, u'OPENID Not Found', description=u'微信 OPENID 不存在')
45
+    """ 微信相关错误码  4007xx """
46
+    WECHAT_NOT_FOUND = StatusCodeField(400701, u'Wechat Not Found', description=u'微信不存在')
47
+    UNIONID_NOT_FOUND = StatusCodeField(400702, u'Unionid Not Found', description=u'微信 UNIONID 不存在')
48
+    OPENID_NOT_FOUND = StatusCodeField(400703, u'OPENID Not Found', description=u'微信 OPENID 不存在')
37 49
 
38 50
 
39 51
 class PhotoStatusCode(BaseStatusCode):

adminSystem - Gogs: Go Git Service

No Description

package.json 1.4KB

    { "_from": "babel-helper-get-function-arity@^6.24.1", "_id": "babel-helper-get-function-arity@6.24.1", "_inBundle": false, "_integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "_location": "/babel-helper-get-function-arity", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, "raw": "babel-helper-get-function-arity@^6.24.1", "name": "babel-helper-get-function-arity", "escapedName": "babel-helper-get-function-arity", "rawSpec": "^6.24.1", "saveSpec": null, "fetchSpec": "^6.24.1" }, "_requiredBy": [ "/babel-helper-function-name", "/babel-plugin-transform-es2015-parameters" ], "_resolved": "http://registry.npm.taobao.org/babel-helper-get-function-arity/download/babel-helper-get-function-arity-6.24.1.tgz", "_shasum": "8f7782aa93407c41d3aa50908f89b031b1b6853d", "_spec": "babel-helper-get-function-arity@^6.24.1", "_where": "/Users/FFIB/Desktop/data_visualization/node_modules/babel-helper-function-name", "bundleDependencies": false, "dependencies": { "babel-runtime": "^6.22.0", "babel-types": "^6.24.1" }, "deprecated": false, "description": "Helper function to get function arity", "license": "MIT", "main": "lib/index.js", "name": "babel-helper-get-function-arity", "repository": { "type": "git", "url": "https://github.com/babel/babel/tree/master/packages/babel-helper-get-function-arity" }, "version": "6.24.1" }