用户登录

src/weixin/control_auth.py

@@ -119,20 +119,20 @@ def login_user_v3(request):
 
     user = None
 
-    if openid:
-        user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
-    else:
-        if unionid or phone:
-            user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(unionid=unionid)).order_by("-id").first()
+    #if openid:
+    #    user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
+    #else:
+    #    if unionid or phone:
+    #        user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(unionid=unionid)).order_by("-id").first()
 
-    #if unionid:
-    #    user = cm.UserInfo.objects.filter(unionid=unionid).order_by("-id").first()
+    if unionid:
+        user = cm.UserInfo.objects.filter(unionid=unionid).order_by("-id").first()
 
-    #if not user and openid:
-    #    user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
+    if not user and openid:
+        user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
 
-    #if not user and phone:
-    #    user = cm.UserInfo.objects.filter(phone=phone).order_by("-id").first()
+    if not user and phone:
+        user = cm.UserInfo.objects.filter(phone=phone).order_by("-id").first()
 
     if not user:
         #新用户
@@ -196,30 +196,30 @@ def get_wxauth_info_v3(request):
 
     user = None
 
-    if openid:
-        user = cm.UserInfo.objects.filter(openid=openid).values().first()
-    else:
-        if phone:
-            orgcode = ccc.cache.get(phone)
-            if not phcode == orgcode and not phone=="13883187629":
-                raise ce.TipException(u"验证码不正确!")
-            user = cm.UserInfo.objects.filter(phone=phone).values().first()
-        if unionid:
-            user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
-
-    #if phone:
-    #    orgcode = ccc.cache.get(phone)
-    #    if not phcode == orgcode and not phone=="13883187629":
-    #        raise ce.TipException(u"验证码不正确!")
-
-    #if unionid:
-    #    user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
-
-    #if not user and openid:
+    #if openid:
     #    user = cm.UserInfo.objects.filter(openid=openid).values().first()
+    #else:
+    #    if phone:
+    #        orgcode = ccc.cache.get(phone)
+    #        if not phcode == orgcode and not phone=="13883187629":
+    #            raise ce.TipException(u"验证码不正确!")
+    #        user = cm.UserInfo.objects.filter(phone=phone).values().first()
+    #    if unionid:
+    #        user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
+
+    if phone:
+        orgcode = ccc.cache.get(phone)
+        if not phcode == orgcode and not phone=="13883187629":
+            raise ce.TipException(u"验证码不正确!")
+
+    if unionid:
+        user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
+
+    if not user and openid:
+        user = cm.UserInfo.objects.filter(openid=openid).values().first()
 
-    #if not user and phone:
-    #    user = cm.UserInfo.objects.filter(phone=phone).values().first()
+    if not user and phone:
+        user = cm.UserInfo.objects.filter(phone=phone).values().first()
 
     if not user:
         return {}

src/weixin/controls.py

@@ -1613,7 +1613,7 @@ def get_champion_articles_list(request):
     else:
         total = qset.count()
 
-    data = list(qset.values())
+    data = list(qset.values("name","ctime","id","img"))
     for item in data:
         item["ctime"] = ccf.datetime_to_str(item["ctime"],"%Y-%m-%d")
     return total,data
@@ -2968,7 +2968,7 @@ def get_baike_list_by_category(**kwargs):
     category_id = kwargs.get("category_id")
     sub_catids = get_sub_catids(category_id,[])
     qset = cm.BaikeDetail.objects.filter(category_id__in=sub_catids)
-    data = list(qset.values())
+    data = list(qset.values("id","img","intro","ctime","name","category_id"))
     
     page = int(kwargs.get("page",1))
     page_size = int(kwargs.get("page_size",20))
@@ -2986,6 +2986,7 @@ def get_baike_detail(**kwargs):
     #_id = kwargs.get("id")
     category_id = kwargs.get("category_id")
     data = list(cm.BaikeDetail.objects.filter(category_id=category_id).values())
+    data = data[0] if data else {}
     return data
 
 def get_app_version(request):
@@ -3081,7 +3082,7 @@ def delete_user_info(request):
 def get_random_bake_list(**kwargs):
     """
     """
-    baikes = list(cm.BaikeDetail.objects.all().values())
+    baikes = list(cm.BaikeDetail.objects.all().values("id","name","intro","img","category_id"))
     randomi = []
     while len(randomi) < 5:
         num = random.randint(0,len(baikes)-1)
@@ -3097,7 +3098,7 @@ def articles_top5_by_type(**kwargs):
     cats = const.ARTICLE_TYPE_LIST
     data = []
     for cat in cats:
-        articles = list(cm.Article.objects.filter(category=cat).order_by("-id").values()[:5])
+        articles = list(cm.Article.objects.filter(category=cat).order_by("-id").values("id","name","ctime","img")[:5])
         data.append({"category":cat,"articles":articles})
     return data