ed9c5R163">163
+                                    window.location.reload();
164
+                                } else {
165
+                                    show_error_dialog('错误', data.description);
166
+                                }
167
+                            }
168
+                        })
169
+                    }
170
+                });
171
+
172
+                $('#dialog .weui_btn_dialog').click(function () {
173
+                    $('#dialog').hide();
174
+                })
175
+            });
176
+            {% endif %}
177
+        </script>
178
+        <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
179
+        <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.4.js' %}"></script>
180
+        <script>
181
+            V.initWxData({
182
+                imgUrl: 'http://pai.ai/static/pai2/img/paiai_96_96.png',
183
+                link: 'http://pai.ai/w/o?r=http%3A%2F%2Fkodo.xfoto.com.cn%2Fp%2Fclerk',
184
+                desc: '店员授权',
185
+                title: '店员授权',
186
+                timeLine: ''
187
+            }, true);
188
+            V.hideOptionMenu();
189
+        </script>
190
+    </body>
191
+</html>

+ 366 - 0
page/templates/page/clerk_sale.html

@@ -0,0 +1,366 @@
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="//res.wx.qq.com/open/libs/weui/0.4.3/weui.min.css" rel="stylesheet" type="text/css" />
13
+        <link href="{% static 'page/css/weui.ext.css' %}?v=1" rel="stylesheet" type="text/css" />
14
+    </head>
15
+    <body>
16
+        <div class="container" >
17
+            <div id="machine_info">
18
+                <div class="weui_cells_title">机器信息</div>
19
+                <div class="weui_cells weui_cells_form">
20
+                    <div class="weui_cell">
21
+                        <div class="weui_cell_hd"><label for="" class="weui_label">型号</label></div>
22
+                        <div class="weui_cell_bd weui_cell_primary">
23
+                            <input id="model" class="weui_input" type="text" value="" placeholder="请选择相机型号" disabled>
24
+                        </div>
25
+                    </div>
26
+                    <div id="model_radio" class="weui_cells weui_cells_radio radio_cells">
27
+                        {% for model in models %}
28
+                        <div>
29
+                            <input type="radio" class="weui_check" name="model" id="{{ model.model_id }}" value="{{ model.model_id }}" {% if forloop.first %}checked="checked"{% endif %}>
30
+                            <label class="weui_cell weui_check_label quartern" for="{{ model.model_id }}">
31
+                                <div class="weui_cell_bd weui_cell_primary">{{ model.model_name }}</div>
32
+                            </label>
33
+                        </div>
34
+                        {% endfor %}
35
+                    </div>
36
+                    <div class="weui_cell">
37
+                        <div class="weui_cell_hd"><label for="" class="weui_label">卡口</label></div>
38
+                        <div class="weui_cell_bd weui_cell_primary">
39
+                            <input id="mount" class="weui_input" type="text" value="" placeholder="请选择相机卡口" disabled>
40
+                        </div>
41
+                    </div>
42
+                    <div id="mount_radio" class="weui_cells weui_cells_radio radio_cells">
43
+                        <div>
44
+                            <input type="radio" class="weui_check" name="mount" id="e" value="E" checked="checked">
45
+                            <label class="weui_cell weui_check_label quartern" for="e">
46
+                                <div class="weui_cell_bd weui_cell_primary">E</div>
47
+                            </label>
48
+                        </div>
49
+                        <div>
50
+                            <input type="radio" class="weui_check" name="mount" id="n" value="N">
51
+                            <label class="weui_cell weui_check_label quartern" for="n">
52
+                                <div class="weui_cell_bd weui_cell_primary">N</div>
53
+                            </label>
54
+                        </div>
55
+                        <div>
56
+                            <input type="radio" class="weui_check" name="mount" id="s" value="S">
57
+                            <label class="weui_cell weui_check_label quartern" for="s">
58
+                                <div class="weui_cell_bd weui_cell_primary">S</div>
59
+                            </label>
60
+                        </div>
61
+                        <div>
62
+                            <input type="radio" class="weui_check" name="mount" id="p" value="P">
63
+                            <label class="weui_cell weui_check_label quartern" for="p">
64
+                                <div class="weui_cell_bd weui_cell_primary">P</div>
65
+                            </label>
66
+                        </div>
67
+                    </div>
68
+                    <div class="weui_cell">
69
+                        <div class="weui_cell_hd"><label for="" class="weui_label">机身码</label></div>
70
+                        <div class="weui_cell_bd weui_cell_primary">
71
+                            <input id="code" class="weui_input" type="text" value="" placeholder="请输入机身码">
72
+                        </div>
73
+                        <div class="weui_cell_ft">
74
+                            <a id="scan" href="javascript:;" class="weui_btn weui_btn_mini weui_btn_default">扫码</a>
75
+                        </div>
76
+                    </div>
77
+                </div>
78
+
79
+                <br>
80
+
81
+                <button id="submit1" class="weui_btn weui_btn_warn">确认</button>
82
+            </div>
83
+
84
+            <div id="customer_info" style="display: none;">
85
+                <div class="weui_cells_title">消费者信息</div>
86
+                <div class="weui_cells weui_cells_form">
87
+                    <div class="weui_cell">
88
+                        <div class="weui_cell_hd"><label for="" class="weui_label">姓名</label></div>
89
+                        <div class="weui_cell_bd weui_cell_primary">
90
+                            <input id="name" class="weui_input" type="text" value="" placeholder="请输入消费者姓名">
91
+                        </div>
92
+                    </div>
93
+                    <div class="weui_cell">
94
+                        <div class="weui_cell_hd"><label for="" class="weui_label">性别</label></div>
95
+                        <div class="weui_cell_bd weui_cell_primary">
96
+                            <input id="sex" class="weui_input" type="text" value="" placeholder="请选择消费者性别" disabled>
97
+                        </div>
98
+                    </div>
99
+                    <div id="sex_radio" class="weui_cells weui_cells_radio radio_cells">
100
+                        <div>
101
+                            <input type="radio" class="weui_check" name="sex" id="male" value="1" checked="checked">
102
+                            <label class="weui_cell weui_check_label quartern" for="male">
103
+                                <div class="weui_cell_bd weui_cell_primary">先生</div>
104
+                            </label>
105
+                        </div>
106
+                        <div>
107
+                            <input type="radio" class="weui_check" name="sex" id="female" value="0">
108
+                            <label class="weui_cell weui_check_label quartern" for="female">
109
+                                <div class="weui_cell_bd weui_cell_primary">女士</div>
110
+                            </label>
111
+                        </div>
112
+                    </div>
113
+                    <div class="weui_cell">
114
+                        <div class="weui_cell_hd"><label for="" class="weui_label">年龄段</label></div>
115
+                        <div class="weui_cell_bd weui_cell_primary">
116
+                            <input id="age" class="weui_input" type="text" value="" placeholder="请选择消费者年龄段" disabled>
117
+                        </div>
118
+                    </div>
119
+                    <div id="age_radio" class="weui_cells weui_cells_radio radio_cells">
120
+                        <div>
121
+                            <input type="radio" class="weui_check" name="age" id="age1" value="1" checked="checked">
122
+                            <label class="weui_cell weui_check_label quartern" for="age1">
123
+                                <div class="weui_cell_bd weui_cell_primary">20岁以下</div>
124
+                            </label>
125
+                        </div>
126
+                        <div>
127
+                            <input type="radio" class="weui_check" name="age" id="age2" value="2">
128
+                            <label class="weui_cell weui_check_label quartern" for="age2">
129
+                                <div class="weui_cell_bd weui_cell_primary">20~30岁</div>
130
+                            </label>
131
+                        </div>
132
+                        <div>
133
+                            <input type="radio" class="weui_check" name="age" id="age3" value="3">
134
+                            <label class="weui_cell weui_check_label quartern" for="age3">
135
+                                <div class="weui_cell_bd weui_cell_primary">30~40岁</div>
136
+                            </label>
137
+                        </div>
138
+                        <div>
139
+                            <input type="radio" class="weui_check" name="age" id="age4" value="4">
140
+                            <label class="weui_cell weui_check_label quartern" for="age4">
141
+                                <div class="weui_cell_bd weui_cell_primary">40~50岁</div>
142
+                            </label>
143
+                        </div>
144
+                        <div>
145
+                            <input type="radio" class="weui_check" name="age" id="age5" value="5">
146
+                            <label class="weui_cell weui_check_label quartern" for="age5">
147
+                                <div class="weui_cell_bd weui_cell_primary">50岁以上</div>
148
+                            </label>
149
+                        </div>
150
+                    </div>
151
+                    <div class="weui_cell">
152
+                        <div class="weui_cell_hd"><label for="" class="weui_label">手机号</label></div>
153
+                        <div class="weui_cell_bd weui_cell_primary">
154
+                            <input id="phone" class="weui_input" type="text" required="required" pattern="1[0-9]{10}" value="" placeholder="请输入消费者手机号">
155
+                        </div>
156
+                    </div>
157
+                </div>
158
+
159
+                <br>
160
+
161
+                <button id="submit2" class="weui_btn weui_btn_warn">确认</button>
162
+            </div>
163
+
164
+            <div class="weui_dialog_alert" id="dialog" style="display: none">
165
+                <div class="weui_mask"></div>
166
+                <div class="weui_dialog">
167
+                    <div class="weui_dialog_hd"><strong id="title" class="weui_dialog_title">弹窗标题</strong></div>
168
+                    <div id="content" class="weui_dialog_bd">弹窗内容,告知当前页面信息等</div>
169
+                    <div class="weui_dialog_ft">
170
+                        <a href="javascript:;" class="weui_btn_dialog primary">确定</a>
171
+                    </div>
172
+                </div>
173
+            </div>
174
+
175
+            <div class="weui_dialog_alert" id="dialog2" style="display: none">
176
+                <div class="weui_mask"></div>
177
+                <div class="weui_dialog">
178
+                    <div class="weui_dialog_hd"><strong id="title" class="weui_dialog_title">弹窗标题</strong></div>
179
+                    <div id="content" class="weui_dialog_bd">弹窗内容,告知当前页面信息等</div>
180
+                    <div class="weui_dialog_ft">
181
+                        <a href="javascript:;" class="weui_btn_dialog primary">确定</a>
182
+                    </div>
183
+                </div>
184
+            </div>
185
+
186
+            <div class="weui_dialog_alert" id="dialog3" style="display: none">
187
+                <div class="weui_mask"></div>
188
+                <div class="weui_dialog">
189
+                    <div class="weui_dialog_hd"><strong id="title" class="weui_dialog_title">弹窗标题</strong></div>
190
+                    <div id="content" class="weui_dialog_bd">弹窗内容,告知当前页面信息等</div>
191
+                    <div class="weui_dialog_ft">
192
+                        <a href="javascript:;" class="weui_btn_dialog primary">确定</a>
193
+                    </div>
194
+                </div>
195
+            </div>
196
+
197
+            <div id="toast" style="display: none;">
198
+                <div class="weui_mask_transparent"></div>
199
+                <div class="weui_toast">
200
+                    <i class="weui_icon_toast"></i>
201
+                    <p class="weui_toast_content">已完成</p>
202
+                </div>
203
+            </div>
204
+        </div>
205
+
206
+        <script src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script>
207
+        <script>
208
+            $(function() {
209
+                function show_error_dialog(title, content) {
210
+                    $('#dialog #title').text(title);
211
+                    $('#dialog #content').text(content);
212
+                    $('#dialog').show();
213
+                }
214
+
215
+                function show_error_dialog2(title, content) {
216
+                    $('#dialog2 #title').text(title);
217
+                    $('#dialog2 #content').text(content);
218
+                    $('#dialog2').show();
219
+                }
220
+
221
+                function show_error_dialog3(title, content) {
222
+                    $('#dialog3 #title').text(title);
223
+                    $('#dialog3 #content').text(content);
224
+                    $('#dialog3').show();
225
+                }
226
+
227
+                function data_check() {
228
+                    var clerk_id = "{{ clerk_info.clerk_id }}";
229
+                    if (!clerk_id) {
230
+                        show_error_dialog('微信授权', '微信授权失败,请重新打开页面');
231
+                        return false;
232
+                    }
233
+
234
+                    var code = $('#code').val();
235
+                    if (!code) {
236
+                        show_error_dialog('机身码', '机身码错误,请检查重新输入');
237
+                        return false;
238
+                    }
239
+
240
+                    return {
241
+                        step: 1,
242
+                        clerk_id: clerk_id,
243
+                        model_id: $("#model_radio input[name='model']:checked").val(),
244
+                        mount: $("#mount_radio input[name='mount']:checked").val(),
245
+                        code: code,
246
+                    }
247
+                }
248
+
249
+                function data_check2() {
250
+                    var clerk_id = "{{ clerk_info.clerk_id }}";
251
+                    if (!clerk_id) {
252
+                        show_error_dialog('微信授权', '微信授权失败,请重新打开页面');
253
+                        return false;
254
+                    }
255
+
256
+                    var code = $('#code').val();
257
+                    if (!code) {
258
+                        show_error_dialog('机身码', '机身码错误,请检查重新输入');
259
+                        return false;
260
+                    }
261
+
262
+                    var name = $('#name').val();
263
+                    if (!name) {
264
+                        show_error_dialog('姓名', '姓名错误,请检查重新输入');
265
+                        return false;
266
+                    }
267
+
268
+                    var phone = $('#phone').val();
269
+                    var phone_valid = $('#phone').is(':valid');
270
+                    if (!(phone && phone_valid)) {
271
+                        show_error_dialog('手机号', '手机号错误,请检查重新输入');
272
+                        return false;
273
+                    }
274
+
275
+                    return {
276
+                        step: 2,
277
+                        clerk_id: clerk_id,
278
+                        model_id: $("#model_radio input[name='model']:checked").val(),
279
+                        mount: $("#mount_radio input[name='mount']:checked").val(),
280
+                        code: code,
281
+                        name: name,
282
+                        sex: $("#sex_radio input[name='sex']:checked").val(),
283
+                        age: $("#age_radio input[name='age']:checked").val(),
284
+                        phone: phone,
285
+                    }
286
+                }
287
+
288
+                $('#submit1').click(function () {
289
+                    var check_result = data_check();
290
+                    if (check_result){
291
+                        $.ajax({
292
+                            type: 'POST',
293
+                            url: '{{ domain }}/api/clerk/sale/submit',
294
+                            data: check_result,
295
+                            success: function(data) {
296
+                                if (data.status == 200) {
297
+{#                                    $('#toast').show();#}
298
+{#                                    setTimeout(function () {#}
299
+{#                                        $('#toast').hide();#}
300
+{#                                    }, 1000);#}
301
+                                    show_error_dialog2('成功', '机器信息提交成功');
302
+                                } else {
303
+                                    show_error_dialog('错误', data.description);
304
+                                }
305
+                            }
306
+                        })
307
+                    }
308
+                });
309
+
310
+                $('#submit2').click(function () {
311
+                    var check_result = data_check2();
312
+                    if (check_result){
313
+                        $.ajax({
314
+                            type: 'POST',
315
+                            url: '{{ domain }}/api/clerk/sale/submit',
316
+                            data: check_result,
317
+                            success: function(data) {
318
+                                if (data.status == 200) {
319
+                                    show_error_dialog3('成功', '消费者信息提交成功');
320
+                                } else {
321
+                                    show_error_dialog('错误', data.description);
322
+                                }
323
+                            }
324
+                        })
325
+                    }
326
+                });
327
+
328
+                $('#dialog .weui_btn_dialog').click(function () {
329
+                    $('#dialog').hide();
330
+                })
331
+
332
+                $('#dialog2 .weui_btn_dialog').click(function () {
333
+                    $('#dialog2').hide();
334
+                    $('#machine_info').hide();
335
+                    $('#customer_info').show();
336
+                })
337
+
338
+                $('#dialog3 .weui_btn_dialog').click(function () {
339
+                    $('#dialog').hide();
340
+                    window.location.reload();
341
+                })
342
+            });
343
+        </script>
344
+        <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
345
+        <script type="text/javascript" src="{% static 'pai2/js/jswe-0.0.4.js' %}"></script>
346
+        <script>
347
+            V.initWxData({
348
+                imgUrl: 'http://pai.ai/static/pai2/img/paiai_96_96.png',
349
+                link: 'http://pai.ai/w/o?r=http%3A%2F%2Fkodo.xfoto.com.cn%2Fp%2Fclerk%2Fsale',
350
+                desc: '店员授权',
351
+                title: '店员授权',
352
+                timeLine: ''
353
+            }, true);
354
+            V.hideOptionMenu();
355
+
356
+            $('#scan').click(function () {
357
+                V.scanQRCode({
358
+                    needResult: 1
359
+                });
360
+            });
361
+            V.wxScanQRCodeSuccess = function (res) {
362
+                $('#code').val(V.parseScanQRCodeResultStr(res.resultStr));
363
+            }
364
+        </script>
365
+    </body>
366
+</html>

+ 1 - 1
page/templates/page/lensman_oauth.html

@@ -190,7 +190,7 @@
190 190
         <script>
191 191
             V.initWxData({
192 192
                 imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png",
193
-                link: 'http://pai.ai/we/we_oauth2?redirect_url=http://pai.ai/page/lensman&scope=snsapi_userinfo',
193
+                link: 'http://pai.ai/w/o?r=http%3A%2F%2Fpai.ai%2Fp%2Flensman',
194 194
                 desc: "摄影师授权",
195 195
                 title: "摄影师授权",
196 196
                 timeLine: ""

+ 1 - 1
page/templates/page/login_qrcode.html

@@ -51,7 +51,7 @@
51 51
         <script>
52 52
             V.initWxData({
53 53
                 imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png",
54
-                link: 'http://pai.ai/we/we_oauth2?redirect_url=http://pai.ai/page/loginqr&scope=snsapi_userinfo',
54
+                link: 'http://pai.ai/w/o?r=http%3A%2F%2Fpai.ai%2Fp%2Floginqr',
55 55
                 desc: "授权登录",
56 56
                 title: "授权登录",
57 57
                 timeLine: ""

+ 1 - 1
page/templates/page/tourguide_oauth.html

@@ -252,7 +252,7 @@
252 252
         <script>
253 253
             V.initWxData({
254 254
                 imgUrl: "http://pai.ai/static/pai2/img/paiai_96_96.png",
255
-                link: 'http://pai.ai/we/we_oauth2?redirect_url=http://pai.ai/page/tourguide&scope=snsapi_userinfo',
255
+                link: 'http://pai.ai/w/o?r=http%3A%2F%2Fpai.ai%2Fp%2Ftourguide',
256 256
                 desc: "导游授权",
257 257
                 title: "导游授权",
258 258
                 timeLine: ""

+ 7 - 1
page/urls.py

@@ -4,7 +4,7 @@ from django.conf.urls import url
4 4
 
5 5
 from account import tourguide_views
6 6
 from group import lensman_views
7
-from page import oauth_views, page_views
7
+from page import info_views, oauth_views, page_views, sale_views
8 8
 
9 9
 
10 10
 urlpatterns = [
@@ -28,3 +28,9 @@ urlpatterns += [
28 28
 urlpatterns += [
29 29
     url(r'^t/submit$', tourguide_views.tourguide_submit_api, name='tourguide_submit_api'),  # 导游信息提交
30 30
 ]
31
+
32
+urlpatterns = [
33
+    url(r'^clerk$', oauth_views.clerk_oauth, name='clerk_oauth'),  # 店员授权页面
34
+    url(r'^clerk/sale$', sale_views.clerk_sale_oauth, name='clerk_sale_oauth'),  # 店员销售授权页面
35
+    url(r'^clerk/info$', info_views.clerk_info_oauth, name='clerk_info_oauth'),  # 店员信息授权页面
36
+]

+ 23 - 21
pai2/settings.py

@@ -43,8 +43,8 @@ INSTALLED_APPS = (
43 43
     'django.contrib.sessions',
44 44
     'django.contrib.messages',
45 45
     'django.contrib.staticfiles',
46
-    'rest_framework',
47
-    'django_q',
46
+    # 'rest_framework',
47
+    # 'django_q',
48 48
     'django_rlog',
49 49
     'django_uniapi',
50 50
     'django_we',
@@ -53,6 +53,7 @@ INSTALLED_APPS = (
53 53
     'account',
54 54
     'box',
55 55
     'group',
56
+    'integral',
56 57
     'mch',
57 58
     'message',
58 59
     'miniapp',
@@ -60,6 +61,7 @@ INSTALLED_APPS = (
60 61
     'page',
61 62
     'pay',
62 63
     'photo',
64
+    'product',
63 65
     'server',
64 66
     'website',
65 67
 )
@@ -79,12 +81,12 @@ MIDDLEWARE_CLASSES = (
79 81
     'mobi.middleware.MobileDetectionMiddleware',
80 82
 )
81 83
 
82
-MIDDLEWARE_CLASSES += ('multidomain.middleware.DomainMiddleware', )
83
-
84
-URL_CONFIG = (
85
-    # (r'^(.+\.)?xfoto\.com\.cn', 'pai2.urls_www'),
86
-    (r'^(.+\.)?api\.pai\.ai', 'pai2.urls_api'),
87
-)
84
+# MIDDLEWARE_CLASSES += ('multidomain.middleware.DomainMiddleware', )
85
+#
86
+# URL_CONFIG = (
87
+#     # (r'^(.+\.)?xfoto\.com\.cn', 'pai2.urls_www'),
88
+#     (r'^(.+\.)?api\.pai\.ai', 'pai2.urls_api'),
89
+# )
88 90
 
89 91
 ROOT_URLCONF = 'pai2.urls'
90 92
 
@@ -121,7 +123,7 @@ DATABASES = {
121 123
     # CREATE DATABASE pai2 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
122 124
     'default': {
123 125
         'ENGINE': 'django.db.backends.mysql',
124
-        'NAME': 'pai2',
126
+        'NAME': 'kodo',
125 127
         'USER': 'root',
126 128
         'PASSWORD': '',
127 129
         'CONN_MAX_AGE': 600,
@@ -385,18 +387,18 @@ THUMBUP_MESSAGE_AVATAR = PAI2_LOGO_URL
385 387
 # Redis 连接
386 388
 REDIS_CACHE = connector(REDIS.get('default', {}))
387 389
 
388
-Q_CLUSTER = {
389
-    'name': 'pai2',
390
-    'workers': 8,
391
-    'recycle': 500,
392
-    'timeout': 60,
393
-    'compress': True,
394
-    'cpu_affinity': 1,
395
-    'save_limit': 250,
396
-    'queue_limit': 500,
397
-    'label': 'Django Q',
398
-    'redis_conn': REDIS_CACHE,
399
-}
390
+# Q_CLUSTER = {
391
+#     'name': 'pai2',
392
+#     'workers': 8,
393
+#     'recycle': 500,
394
+#     'timeout': 60,
395
+#     'compress': True,
396
+#     'cpu_affinity': 1,
397
+#     'save_limit': 250,
398
+#     'queue_limit': 500,
399
+#     'label': 'Django Q',
400
+#     'redis_conn': REDIS_CACHE,
401
+# }
400 402
 
401 403
 DJLOGIT = {
402 404
     'level': 'DEBUG',

+ 49 - 43
pai2/urls.py

@@ -29,51 +29,51 @@ from photo import views as photo_views
29 29
 from website import views as website_views
30 30
 
31 31
 
32
-router = routers.DefaultRouter()
33
-# router.register(r'users', account_views.UserViewSet)
34
-# router.register(r'groups', account_views.GroupViewSet)
35
-
36
-router.register(r'lensmans', account_views.LensmanInfoViewSet)
37
-router.register(r'users', account_views.UserInfoViewSet)
38
-
39
-router.register(r'groups', group_views.GroupInfoViewSet)
40
-router.register(r'group_users', group_views.GroupUserInfoViewSet)
41
-router.register(r'group_photos', group_views.GroupPhotoInfoViewSet)
42
-
43
-router.register(r'photos', photo_views.PhotoInfoViewSet)
32
+# router = routers.DefaultRouter()
33
+# # router.register(r'users', account_views.UserViewSet)
34
+# # router.register(r'groups', account_views.GroupViewSet)
35
+#
36
+# router.register(r'lensmans', account_views.LensmanInfoViewSet)
37
+# router.register(r'users', account_views.UserInfoViewSet)
38
+#
39
+# router.register(r'groups', group_views.GroupInfoViewSet)
40
+# router.register(r'group_users', group_views.GroupUserInfoViewSet)
41
+# router.register(r'group_photos', group_views.GroupPhotoInfoViewSet)
42
+#
43
+# router.register(r'photos', photo_views.PhotoInfoViewSet)
44 44
 
45 45
 urlpatterns = [
46 46
     url(r'^pai2admin/', include(admin.site.urls)),
47 47
 ]
48 48
 
49
-urlpatterns += [
50
-    # url(r'^api/', include('api.urls', namespace='api')),
51
-    url(r'^s/(?P<session_id>\w+)$', photo_views.session_detail, name='session_detail'),  # Session 详情
52
-    url(r'^p/(?P<photo_id>\w+)$', photo_views.photo_standard, name='photo_standard'),  # standard thumbnail, available for free
53
-    url(r'^m/(?P<photo_id>\w+)$', photo_views.photo_medium, name='photo_medium'),  # medium/mobile version, without watermark, login or paid by others
54
-    url(r'^l/(?P<photo_id>\w+)$', photo_views.photo_large, name='photo_large'),  # large, might support server side panning later, login required
55
-    url(r'^r/(?P<photo_id>\w+)$', photo_views.photo_raw, name='photo_raw'),  # raw image, only for finishers
56
-]
57
-
58
-urlpatterns += [
59
-    url(r'^g/(?P<group_id>\w+)$', grouppage_views.group_detail, name='group_detail'),  # 群组详情(拍爱用户端下载页)
60
-]
61
-
62
-urlpatterns += [
63
-    url(r'^gp/(?P<photo_id>\w+)$', grouppage_views.group_photo_detail, name='group_photo_detail'),  # 群组照片详情
64
-]
65
-
66
-urlpatterns += [
67
-    url(r'^tg/(?P<admin_id>\w+)$', grouppage_views.tgu_group_detail, name='tgu_group_detail'),  # 旅行团详情(拍爱导游端下载页)
68
-]
69
-
70
-urlpatterns += [
71
-    url(r'^tgu/(?P<admin_id>\w+)$', grouppage_views.tgu_group_user_detail, name='tgu_group_user_detail'),  # 旅行团成员详情(拍爱用户端下载页)
72
-]
73
-
74
-urlpatterns += [
75
-    url(r'^$', website_views.pai2_home, name='pai2_home'),  # 官网首页
76
-]
49
+# urlpatterns += [
50
+#     # url(r'^api/', include('api.urls', namespace='api')),
51
+#     url(r'^s/(?P<session_id>\w+)$', photo_views.session_detail, name='session_detail'),  # Session 详情
52
+#     url(r'^p/(?P<photo_id>\w+)$', photo_views.photo_standard, name='photo_standard'),  # standard thumbnail, available for free
53
+#     url(r'^m/(?P<photo_id>\w+)$', photo_views.photo_medium, name='photo_medium'),  # medium/mobile version, without watermark, login or paid by others
54
+#     url(r'^l/(?P<photo_id>\w+)$', photo_views.photo_large, name='photo_large'),  # large, might support server side panning later, login required
55
+#     url(r'^r/(?P<photo_id>\w+)$', photo_views.photo_raw, name='photo_raw'),  # raw image, only for finishers
56
+# ]
57
+#
58
+# urlpatterns += [
59
+#     url(r'^g/(?P<group_id>\w+)$', grouppage_views.group_detail, name='group_detail'),  # 群组详情(拍爱用户端下载页)
60
+# ]
61
+#
62
+# urlpatterns += [
63
+#     url(r'^gp/(?P<photo_id>\w+)$', grouppage_views.group_photo_detail, name='group_photo_detail'),  # 群组照片详情
64
+# ]
65
+#
66
+# urlpatterns += [
67
+#     url(r'^tg/(?P<admin_id>\w+)$', grouppage_views.tgu_group_detail, name='tgu_group_detail'),  # 旅行团详情(拍爱导游端下载页)
68
+# ]
69
+#
70
+# urlpatterns += [
71
+#     url(r'^tgu/(?P<admin_id>\w+)$', grouppage_views.tgu_group_user_detail, name='tgu_group_user_detail'),  # 旅行团成员详情(拍爱用户端下载页)
72
+# ]
73
+#
74
+# urlpatterns += [
75
+#     url(r'^$', website_views.pai2_home, name='pai2_home'),  # 官网首页
76
+# ]
77 77
 
78 78
 # Mini App
79 79
 urlpatterns += [
@@ -83,14 +83,20 @@ urlpatterns += [
83 83
 # Wire up our API using automatic URL routing.
84 84
 # Additionally, we include login URLs for the browsable API.
85 85
 urlpatterns += [
86
-    url(r'^api/', include(router.urls)),
87
-    url(r'^page/', include('page.urls', namespace='page')),
86
+    # url(r'^restapi/', include(router.urls)),
88 87
     url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')),
88
+    url(r'^api/', include('api.urls', namespace='api')),
89
+    url(r'^w/', include('django_we.urls', namespace='shortwechat')),
89 90
     url(r'^we/', include('django_we.urls', namespace='wechat')),
90 91
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
91 92
 ]
92 93
 
94
+urlpatterns += [
95
+    url(r'^p/', include('page.urls', namespace='shortpage')),
96
+    url(r'^page/', include('page.urls', namespace='page')),
97
+]
98
+
93 99
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
94 100
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
95 101
 
96
-admin.site.site_header = u'[拍爱]后台管理系统'
102
+admin.site.site_header = u'[盈多]后台管理系统'

+ 1 - 1
pay/admin.py

@@ -13,4 +13,4 @@ class OrderInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
13 13
     search_fields = ('prepay_id', 'transaction_id', 'group_id', 'session_id', 'photo_id', 'lensman_photo_id', 'from_uid', 'to_uid')
14 14
 
15 15
 
16
-admin.site.register(OrderInfo, OrderInfoAdmin)
16
+# admin.site.register(OrderInfo, OrderInfoAdmin)

+ 3 - 3
photo/admin.py

@@ -20,6 +20,6 @@ class PhotosInfoAdmin(admin.ModelAdmin):
20 20
     list_filter = ('lensman_id', 'status')
21 21
 
22 22
 
23
-admin.site.register(UUIDInfo, UUIDInfoAdmin)
24
-admin.site.register(PhotosInfo, PhotosInfoAdmin)
25
-admin.site.register(PhotoUUIDInfo, PhotoUUIDInfoAdmin)
23
+# admin.site.register(UUIDInfo, UUIDInfoAdmin)
24
+# admin.site.register(PhotosInfo, PhotosInfoAdmin)
25
+# admin.site.register(PhotoUUIDInfo, PhotoUUIDInfoAdmin)

+ 8 - 8
photo/views.py

@@ -3,7 +3,7 @@
3 3
 from curtail_uuid import CurtailUUID
4 4
 from django.db import transaction
5 5
 from django.shortcuts import render
6
-from django_q.tasks import async
6
+# from django_q.tasks import async
7 7
 from django_response import response
8 8
 from ipaddr import client_ip
9 9
 from logit import logit
@@ -46,13 +46,13 @@ def uuid(request):
46 46
     # 从 Redis 中 Pop 中指定数量的 UUID
47 47
     uuids, succeed, left = r.multi_pop(UUID_LIST, num)
48 48
 
49
-    # 异步更新 UUID 数据库中状态
50
-    if uuids:
51
-        async(update_uuids, lensman_id, uuids)
52
-
53
-    # 当可用 UUID 数量少于 500 时, 异步创建
54
-    if left < 500:
55
-        async(generate_uuids)
49
+    # # 异步更新 UUID 数据库中状态
50
+    # if uuids:
51
+    #     async(update_uuids, lensman_id, uuids)
52
+    #
53
+    # # 当可用 UUID 数量少于 500 时, 异步创建
54
+    # if left < 500:
55
+    #     async(generate_uuids)
56 56
 
57 57
     return response(200, 'Get UUID Success', u'获取唯一标识成功', uuids)
58 58
 

+ 0 - 0
product/__init__.py


+ 29 - 0
product/admin.py

@@ -0,0 +1,29 @@
1
+# -*- coding: utf-8 -*-
2
+
3
+from django.contrib import admin
4
+
5
+from product.models import ProductCodeSubmitLogInfo, ProductInfo, ProductModelInfo
6
+
7
+
8
+class ProductModelInfoAdmin(admin.ModelAdmin):
9
+    readonly_fields = ('model_id', )
10
+    list_display = ('model_id', 'model_name', 'integral', 'has_mount', 'status', 'created_at', 'updated_at')
11
+    search_fields = ('model_id', 'model_name')
12
+    list_filter = ('has_mount', 'status')
13
+
14
+
15
+class ProductInfoAdmin(admin.ModelAdmin):
16
+    list_display = ('model_id', 'model_name', 'code', 'code_status', 'integral', 'integral_status', 'franchiser_id', 'clerk_id', 'consumer_name', 'consumer_sex', 'consumer_age', 'consumer_phone', 'status', 'created_at', 'updated_at')
17
+    search_fields = ('model_id', 'model_name', 'code', 'consumer_name', 'consumer_phone')
18
+    list_filter = ('code_status', 'integral_status', 'franchiser_id', 'consumer_sex', 'status')
19
+
20
+
21
+class ProductCodeSubmitLogInfoAdmin(admin.ModelAdmin):
22
+    list_display = ('model_id', 'model_name', 'mount', 'code', 'franchiser_id', 'clerk_id', 'consumer_name', 'consumer_sex', 'consumer_age', 'consumer_phone', 'status', 'created_at', 'updated_at')
23
+    search_fields = ('model_id', 'model_name', 'code', 'consumer_name', 'consumer_phone')
24
+    list_filter = ('step', 'mount', 'franchiser_id', 'consumer_sex', 'status')
25
+
26
+
27
+admin.site.register(ProductModelInfo, ProductModelInfoAdmin)
28
+admin.site.register(ProductInfo, ProductInfoAdmin)
29
+admin.site.register(ProductCodeSubmitLogInfo, ProductCodeSubmitLogInfoAdmin)

+ 86 - 0
product/migrations/0001_initial.py

@@ -0,0 +1,86 @@
1
+# -*- coding: utf-8 -*-
2
+# Generated by Django 1.11.9 on 2018-02-07 14:16
3
+from __future__ import unicode_literals
4
+
5
+from django.db import migrations, models
6
+import shortuuidfield.fields
7
+
8
+
9
+class Migration(migrations.Migration):
10
+
11
+    initial = True
12
+
13
+    dependencies = [
14
+    ]
15
+
16
+    operations = [
17
+        migrations.CreateModel(
18
+            name='ProductCodeSubmitLogInfo',
19
+            fields=[
20
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21
+                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
22
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
23
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
24
+                ('sex', models.BooleanField(choices=[(1, '\u7537'), (0, '\u5973')], db_index=True, default=1, help_text='Sex', verbose_name='sex')),
25
+                ('step', models.IntegerField(db_index=True, default=1, help_text='\u63d0\u4ea4\u6b65\u9aa4', verbose_name='step')),
26
+                ('model_id', models.CharField(blank=True, db_index=True, help_text='\u578b\u53f7\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='model_id')),
27
+                ('model_name', models.CharField(blank=True, db_index=True, help_text='\u578b\u53f7\u540d\u79f0', max_length=32, null=True, verbose_name='model_name')),
28
+                ('mount', models.CharField(blank=True, db_index=True, help_text='\u5361\u53e3', max_length=255, null=True, verbose_name='mount')),
29
+                ('code', models.CharField(blank=True, help_text='\u673a\u8eab\u7801', max_length=32, null=True, verbose_name='code')),
30
+                ('franchiser_id', models.CharField(blank=True, db_index=True, help_text='\u7ecf\u9500\u5546\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='franchiser_id')),
31
+                ('clerk_id', models.CharField(blank=True, db_index=True, help_text='\u5e97\u5458\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='clerk_id')),
32
+                ('consumer_name', models.CharField(blank=True, help_text='\u6d88\u8d39\u8005\u540d\u79f0', max_length=32, null=True, verbose_name='consumer_name')),
33
+                ('consumer_sex', models.IntegerField(choices=[(1, '\u7537'), (0, '\u5973')], db_index=True, default=1, help_text='\u6d88\u8d39\u8005\u6027\u522b', verbose_name='consumer_sex')),
34
+                ('consumer_age', models.IntegerField(default=0, help_text='\u6d88\u8d39\u8005\u5e74\u9f84', verbose_name='consumer_age')),
35
+                ('consumer_phone', models.CharField(blank=True, help_text='\u6d88\u8d39\u8005\u8054\u7cfb\u7535\u8bdd', max_length=11, null=True, verbose_name='consumer_phone')),
36
+            ],
37
+            options={
38
+                'verbose_name': 'productcodesubmitloginfo',
39
+                'verbose_name_plural': 'productcodesubmitloginfo',
40
+            },
41
+        ),
42
+        migrations.CreateModel(
43
+            name='ProductInfo',
44
+            fields=[
45
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
46
+                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
47
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
48
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
49
+                ('sex', models.BooleanField(choices=[(1, '\u7537'), (0, '\u5973')], db_index=True, default=1, help_text='Sex', verbose_name='sex')),
50
+                ('model_id', models.CharField(blank=True, db_index=True, help_text='\u578b\u53f7\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='model_id')),
51
+                ('model_name', models.CharField(blank=True, db_index=True, help_text='\u578b\u53f7\u540d\u79f0', max_length=32, null=True, verbose_name='model_name')),
52
+                ('mount', models.CharField(blank=True, db_index=True, help_text='\u5361\u53e3', max_length=32, null=True, verbose_name='mount')),
53
+                ('code', models.CharField(blank=True, help_text='\u673a\u8eab\u7801', max_length=32, null=True, verbose_name='code')),
54
+                ('code_status', models.BooleanField(db_index=True, default=False, help_text='\u673a\u8eab\u7801\u72b6\u6001, True\u5df2\u4f7f\u7528\uff0cFalse\u672a\u4f7f\u7528', verbose_name='code_status')),
55
+                ('integral', models.IntegerField(default=0, help_text='\u79ef\u5206', verbose_name='integral')),
56
+                ('integral_status', models.BooleanField(db_index=True, default=False, help_text='\u79ef\u5206\u72b6\u6001, True\u5df2\u79ef\u5206\uff0cFalse\u672a\u79ef\u5206', verbose_name='integral_status')),
57
+                ('franchiser_id', models.CharField(blank=True, db_index=True, help_text='\u7ecf\u9500\u5546\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='franchiser_id')),
58
+                ('clerk_id', models.CharField(blank=True, db_index=True, help_text='\u5e97\u5458\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='clerk_id')),
59
+                ('consumer_name', models.CharField(blank=True, help_text='\u6d88\u8d39\u8005\u540d\u79f0', max_length=32, null=True, verbose_name='consumer_name')),
60
+                ('consumer_sex', models.IntegerField(choices=[(1, '\u7537'), (0, '\u5973')], db_index=True, default=1, help_text='\u6d88\u8d39\u8005\u6027\u522b', verbose_name='consumer_sex')),
61
+                ('consumer_age', models.IntegerField(default=0, help_text='\u6d88\u8d39\u8005\u5e74\u9f84', verbose_name='consumer_age')),
62
+                ('consumer_phone', models.CharField(blank=True, help_text='\u6d88\u8d39\u8005\u8054\u7cfb\u7535\u8bdd', max_length=11, null=True, verbose_name='consumer_phone')),
63
+            ],
64
+            options={
65
+                'verbose_name': 'productinfo',
66
+                'verbose_name_plural': 'productinfo',
67
+            },
68
+        ),
69
+        migrations.CreateModel(
70
+            name='ProductModelInfo',
71
+            fields=[
72
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
73
+                ('status', models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status')),
74
+                ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
75
+                ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
76
+                ('model_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='\u578b\u53f7\u552f\u4e00\u6807\u8bc6', max_length=22, unique=True)),
77
+                ('model_name', models.CharField(blank=True, help_text='\u578b\u53f7\u540d\u79f0', max_length=32, null=True, unique=True, verbose_name='model_name')),
78
+                ('integral', models.IntegerField(default=0, help_text='\u578b\u53f7\u79ef\u5206', verbose_name='integral')),
79
+                ('has_mount', models.BooleanField(db_index=True, default=True, help_text='\u662f\u5426\u6709\u5361\u53e3', verbose_name='has_mount')),
80
+            ],
81
+            options={
82
+                'verbose_name': '\u4ea7\u54c1\u578b\u53f7\u4fe1\u606f',
83
+                'verbose_name_plural': '\u4ea7\u54c1\u578b\u53f7\u4fe1\u606f',
84
+            },
85
+        ),
86
+    ]

+ 0 - 0
product/migrations/__init__.py


+ 88 - 0
product/models.py

@@ -0,0 +1,88 @@
1
+# -*- coding: utf-8 -*-
2
+
3
+from django.db import models
4
+from django.utils.translation import ugettext_lazy as _
5
+from models_ext import BaseModelMixin, SexModelMixin
6
+from shortuuidfield import ShortUUIDField
7
+
8
+
9
+class ProductModelInfo(BaseModelMixin):
10
+    model_id = ShortUUIDField(_(u'model_id'), max_length=32, help_text=u'型号唯一标识', db_index=True, unique=True)
11
+    model_name = models.CharField(_(u'model_name'), max_length=32, blank=True, null=True, help_text=u'型号名称', unique=True)
12
+    integral = models.IntegerField(_(u'integral'), default=0, help_text=u'型号积分')
13
+    has_mount = models.BooleanField(_(u'has_mount'), default=True, help_text=u'是否有卡口', db_index=True)
14
+
15
+    class Meta:
16
+        verbose_name = _(u'产品型号信息')
17
+        verbose_name_plural = _(u'产品型号信息')
18
+
19
+    def __unicode__(self):
20
+        return unicode(self.pk)
21
+
22
+    @property
23
+    def data(self):
24
+        return {
25
+            'model_id': self.model_id,
26
+            'model_name': self.model_name,
27
+            'integral': self.integral,
28
+            'has_mount': self.has_mount,
29
+        }
30
+
31
+
32
+class ProductInfo(BaseModelMixin, SexModelMixin):
33
+    model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)
34
+    model_name = models.CharField(_(u'model_name'), max_length=32, blank=True, null=True, help_text=u'型号名称', db_index=True)
35
+
36
+    mount = models.CharField(_(u'mount'), max_length=32, blank=True, null=True, help_text=u'卡口', db_index=True)
37
+    code = models.CharField(_(u'code'), max_length=32, blank=True, null=True, help_text=u'机身码')
38
+    code_status = models.BooleanField(_(u'code_status'), default=False, help_text=u'机身码状态, True已使用,False未使用', db_index=True)
39
+
40
+    integral = models.IntegerField(_(u'integral'), default=0, help_text=u'积分')
41
+    integral_status = models.BooleanField(_(u'integral_status'), default=False, help_text=u'积分状态, True已积分,False未积分', db_index=True)
42
+
43
+    franchiser_id = models.CharField(_(u'franchiser_id'), max_length=32, blank=True, null=True, help_text=u'经销商唯一标识', db_index=True)
44
+    clerk_id = models.CharField(_(u'clerk_id'), max_length=32, blank=True, null=True, help_text=u'店员唯一标识', db_index=True)
45
+
46
+    consumer_name = models.CharField(_(u'consumer_name'), max_length=32, blank=True, null=True, help_text=u'消费者名称')
47
+    consumer_sex = models.IntegerField(_(u'consumer_sex'), choices=SexModelMixin.SEX_TUPLE, default=SexModelMixin.MALE, help_text=u'消费者性别', db_index=True)
48
+    consumer_age = models.IntegerField(_(u'consumer_age'), default=0, help_text=u'消费者年龄')
49
+    consumer_phone = models.CharField(_(u'consumer_phone'), max_length=11, blank=True, null=True, help_text=u'消费者联系电话')
50
+
51
+    class Meta:
52
+        verbose_name = _(u'productinfo')
53
+        verbose_name_plural = _(u'productinfo')
54
+
55
+    def __unicode__(self):
56
+        return unicode(self.pk)
57
+
58
+    @property
59
+    def data(self):
60
+        return {
61
+            'model_id': self.model_id,
62
+            'model_name': self.model_name,
63
+            'code': self.code,
64
+        }
65
+
66
+
67
+class ProductCodeSubmitLogInfo(BaseModelMixin, SexModelMixin):
68
+    step = models.IntegerField(_(u'step'), default=1, help_text=u'提交步骤', db_index=True)
69
+
70
+    model_id = models.CharField(_(u'model_id'), max_length=32, blank=True, null=True, help_text=u'型号唯一标识', db_index=True)
71
+    model_name = models.CharField(_(u'model_name'), max_length=32, blank=True, null=True, help_text=u'型号名称', db_index=True)
72
+    mount = models.CharField(_(u'mount'), max_length=255, blank=True, null=True, help_text=u'卡口', db_index=True)
73
+    code = models.CharField(_(u'code'), max_length=32, blank=True, null=True, help_text=u'机身码')
74
+
75
+    franchiser_id = models.CharField(_(u'franchiser_id'), max_length=32, blank=True, null=True, help_text=u'经销商唯一标识', db_index=True)
76
+    clerk_id = models.CharField(_(u'clerk_id'), max_length=32, blank=True, null=True, help_text=u'店员唯一标识', db_index=True)
77
+
78
+    consumer_name = models.CharField(_(u'consumer_name'), max_length=32, blank=True, null=True, help_text=u'消费者名称')
79
+    consumer_sex = models.IntegerField(_(u'consumer_sex'), choices=SexModelMixin.SEX_TUPLE, default=SexModelMixin.MALE, help_text=u'消费者性别', db_index=True)
80
+    consumer_age = models.IntegerField(_(u'consumer_age'), default=0, help_text=u'消费者年龄')
81
+    consumer_phone = models.CharField(_(u'consumer_phone'), max_length=11, blank=True, null=True, help_text=u'消费者联系电话')
82
+
83
+    class Meta:
84
+        verbose_name = _(u'productcodesubmitloginfo')
85
+        verbose_name_plural = _(u'productcodesubmitloginfo')
86
+
87
+    def __unicode__(self):
88
+        return unicode(self.pk)

+ 4 - 0
product/tests.py

@@ -0,0 +1,4 @@
1
+from django.test import TestCase
2
+
3
+
4
+# Create your tests here.

+ 4 - 0
product/views.py

@@ -0,0 +1,4 @@
1
+from django.shortcuts import render
2
+
3
+
4
+# Create your views here.

+ 28 - 0
utils/error/errno_utils.py

@@ -3,6 +3,34 @@
3 3
 from StatusCode import BaseStatusCode, StatusCodeField
4 4
 
5 5
 
6
+class FranchiserStatusCode(BaseStatusCode):
7
+    """ 经销商相关错误码 5000xx """
8
+    CHISER_NOT_FOUND = StatusCodeField(500001, 'Chiser Not Found', description=u'经销商不存在')
9
+
10
+
11
+class SaleclerkStatusCode(BaseStatusCode):
12
+    """ 店员相关错误码 5001xx """
13
+    CLERK_NOT_FOUND = StatusCodeField(500101, 'Clerk Not Found', description=u'店员不存在')
14
+    # 手机号
15
+    CLERK_PHONE_ALREADY_EXISTS = StatusCodeField(500105, 'Clerk Phone Already Exists', description=u'手机号已经存在')
16
+    # 状态
17
+    CLERK_ALREADY_NOT_UNVERIFIED = StatusCodeField(500110, 'Clerk Already Not Unverified', description=u'店员帐号已激活')
18
+    CLERK_NOT_ACTIVATED = StatusCodeField(500115, 'Clerk Not Activated', description=u'店员帐号未激活')
19
+
20
+
21
+class ProductModelStatusCode(BaseStatusCode):
22
+    """ 型号相关错误码 5010xx """
23
+    MODEL_NOT_FOUND = StatusCodeField(501001, 'Model Not Found', description=u'型号不存在')
24
+
25
+
26
+class ProductStatusCode(BaseStatusCode):
27
+    """ 产品相关错误码 5020xx """
28
+    PRODUCT_NOT_FOUND = StatusCodeField(502001, 'Product Not Found', description=u'产品不存在')
29
+    # 状态
30
+    PRODUCT_HAS_USED = StatusCodeField(502011, 'Product Has Used', description=u'产品已使用')
31
+    PRODUCT_NOT_USED = StatusCodeField(502012, 'Product Not Used', description=u'产品未使用')
32
+
33
+
6 34
 class LensmanStatusCode(BaseStatusCode):
7 35
     """ 摄影师相关错误码 4000xx """
8 36
     LENSMAN_NOT_FOUND = StatusCodeField(400001, 'Lensman Not Found', description=u'摄影师不存在')

AttributeError: 'ModelInfo' object has no attribute 'model_imgs' · a272ee8787 - Gogs: Go Git Service

AttributeError: 'ModelInfo' object has no attribute 'model_imgs'

Brightcells 7 年 前
コミット
a272ee8787
共有1 個のファイルを変更した1 個の追加1 個の削除を含む
  1. 1 1
      api/encrypt_views.py

+ 1 - 1
api/encrypt_views.py

@@ -75,7 +75,7 @@ def decrypt(request):
75 75
     return response(200, data={
76 76
         'plaintext': plaintext,
77 77
         'logo_url': brand.brand_logo_url if brand else '',
78
-        'model_imgs': model.model_imgs if model else [],
78
+        'model_imgs': model.images if model else [],
79 79
         'goodsInfo': {
80 80
             'Brand': brand.brand_name if brand else '',
81 81
             'Model': model.model_name if model else '',