|
@@ -2014,9 +2014,10 @@ class v3LoginView(TemplateView):
|
|
|
'phone', 'password', 'userIconPath', 'fingerprint_enable', 'fingerprint_key',
|
|
|
'subscribe_email', 'region_country')[0]
|
|
|
number = int(number)
|
|
|
- if users[0]['region_country'] != 0 and number != users[0]['region_country']:
|
|
|
- region_country = users[0]['region_country']
|
|
|
- country = CountryModel.objects.filter(id=region_country).values('country_name')
|
|
|
+ region_country = users['region_country']
|
|
|
+ if number != region_country and region_country != 0:
|
|
|
+ region_country = users['region_country']
|
|
|
+ country_qs = CountryModel.objects.filter(id=region_country).values('country_name')
|
|
|
res = {
|
|
|
'refresh_expire': '',
|
|
|
'subscribe_email': '',
|
|
@@ -2034,9 +2035,9 @@ class v3LoginView(TemplateView):
|
|
|
'rid': '',
|
|
|
'userID': '',
|
|
|
'status': 1,
|
|
|
- 'region': country
|
|
|
+ 'region': country_qs[0]['country_name']
|
|
|
}
|
|
|
- return response.json(177, res)
|
|
|
+ return response.json(0, res)
|
|
|
if not check_password(password, users['password']):
|
|
|
return response.json(111)
|
|
|
|
|
@@ -2073,7 +2074,7 @@ class v3LoginView(TemplateView):
|
|
|
user_qs.update(last_login=now_time, language=response.lang)
|
|
|
else:
|
|
|
user_qs.update(last_login=now_time, language=response.lang, region_country=number)
|
|
|
- region = CountryModel.objects.filter(id=number).values('country_name')
|
|
|
+ region_qs = CountryModel.objects.filter(id=number).values('country_name')
|
|
|
|
|
|
res['rid'] = users['role__rid']
|
|
|
res['roleName'] = users['role__roleName']
|
|
@@ -2093,7 +2094,7 @@ class v3LoginView(TemplateView):
|
|
|
res['authType'] = auth_type
|
|
|
res['subscribe_email'] = users['subscribe_email'] if users['subscribe_email'] is not None else ''
|
|
|
res['status'] = 0
|
|
|
- res['region'] = region
|
|
|
+ res['region'] = region_qs[0]['country_name'] if region_qs[0]['country_name'] is not None else ''
|
|
|
return response.json(0, res)
|
|
|
|
|
|
|