bob
/
newmediamonitoring
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
xieshen 2020-12-07 12:41:03 +08:00
parent 367ec1bdca 660db81f08
commit 24f95e2425
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polls/views/user.py
View File

@ -120,6 +120,8 @@ def register_step_one(request):
phone=phone, code=code, category=category).first() phone=phone, code=code, category=category).first()
if verify_code and verify_code.is_in_progress(): if verify_code and verify_code.is_in_progress():
profile = Userprofile.objects.filter(user__username=phone).first() profile = Userprofile.objects.filter(user__username=phone).first()
if profile.status == 1:
return JsonResponse({'status': 'error', 'message': '账号已激活，不需要重复激活'})
return JsonResponse({'status': 'success', 'message': {'id': profile.user_id, 'phone': phone, 'name': profile.name, 'organization': profile.organization.name}}) return JsonResponse({'status': 'success', 'message': {'id': profile.user_id, 'phone': phone, 'name': profile.name, 'organization': profile.organization.name}})
else: else:
return JsonResponse({'status': 'error', 'message': '验证码超时，请重发'}) return JsonResponse({'status': 'error', 'message': '验证码超时，请重发'})