|
@@ -2078,7 +2078,7 @@ class oneClickLoginView(TemplateView):
|
|
if not phone:
|
|
if not phone:
|
|
return response.json(102)
|
|
return response.json(102)
|
|
|
|
|
|
- user_qs = Device_User.objects.filter(phone=phone).values('userID', 'username', 'NickName', 'phone')
|
|
|
|
|
|
+ user_qs = Device_User.objects.filter(phone=phone).values('userID', 'username', 'NickName', 'phone', 'password')
|
|
# 用户已存在的响应
|
|
# 用户已存在的响应
|
|
if user_qs.exists():
|
|
if user_qs.exists():
|
|
tokenObj = TokenObject()
|
|
tokenObj = TokenObject()
|
|
@@ -2100,6 +2100,8 @@ class oneClickLoginView(TemplateView):
|
|
res['userEmail'] = ''
|
|
res['userEmail'] = ''
|
|
res['userIconUrl'] = ''
|
|
res['userIconUrl'] = ''
|
|
res['subscribe_email'] = ''
|
|
res['subscribe_email'] = ''
|
|
|
|
+ if not user_qs[0]['password']: # 没有设置密码,返回标识
|
|
|
|
+ res['password'] = ''
|
|
return response.json(0, res)
|
|
return response.json(0, res)
|
|
|
|
|
|
# 新用户
|
|
# 新用户
|
|
@@ -2131,6 +2133,7 @@ class oneClickLoginView(TemplateView):
|
|
res['username'] = users.username
|
|
res['username'] = users.username
|
|
res['NickName'] = users.NickName
|
|
res['NickName'] = users.NickName
|
|
res['phone'] = users.phone
|
|
res['phone'] = users.phone
|
|
|
|
+ res['password'] = ''
|
|
res['userEmail'] = ''
|
|
res['userEmail'] = ''
|
|
res['userIconUrl'] = ''
|
|
res['userIconUrl'] = ''
|
|
res['subscribe_email'] = ''
|
|
res['subscribe_email'] = ''
|