|
@@ -117,8 +117,11 @@ def login_user_v3(request):
|
|
|
# raise ce.TipException(u"非法openid!")
|
|
# raise ce.TipException(u"非法openid!")
|
|
|
|
|
|
|
|
user = None
|
|
user = None
|
|
|
- if phone or unionid or openid:
|
|
|
|
|
- user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(unionid=unionid)|Q(openid=openid)).order_by("-id").first()
|
|
|
|
|
|
|
+ if openid:
|
|
|
|
|
+ user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
|
|
|
|
|
+ else:
|
|
|
|
|
+ if unionid or openid:
|
|
|
|
|
+ user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(unionid=unionid)).order_by("-id").first()
|
|
|
|
|
|
|
|
if not user:
|
|
if not user:
|
|
|
#新用户
|
|
#新用户
|