login app/wx baoming

src/weixin/control_auth.py

@@ -117,11 +117,11 @@ def login_user_v3(request):
     #    raise ce.TipException(u"非法openid!")
 
     user = None
-    if openid:
-        user = cm.UserInfo.objects.filter(openid=openid).order_by("-id").first()
+    if unionid:
+        user = cm.UserInfo.objects.filter(unionid=unionid).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 or phone:
+            user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(openid=openid)).order_by("-id").first()
 
     if not user:
         #新用户
@@ -185,16 +185,16 @@ def get_wxauth_info_v3(request):
     phcode = qdata.get("phcode")
 
     user = None
-    if openid:
-        user = cm.UserInfo.objects.filter(openid=openid).values().first()
+    if unionid:
+        user = cm.UserInfo.objects.filter(unionid=unionid).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 openid:
+            user = cm.UserInfo.objects.filter(openid=openid).values().first()
     if not user:
         return {}
     cur_match_id = ccc.get_signup_match().id

src/weixin/urls_backstage.py

@@ -55,6 +55,7 @@ urlpatterns = [
     url(r'^v3/phone/code$', views.V3PhoneCodeView.as_view()),
     url(r'^v3/phone/bind$', views.V3PhoneBindView.as_view()),
     url(r'^v3/signup/info$', views.V3SignupInfoView.as_view()),
+    url(r'^v3/signup/web$', views.V3SignupWebView.as_view()),
     url(r'^v3/signup/wxpay$', views.V3SignupWXPayView.as_view()),
     url(r'^v3/signup/notify$', views.V3SignupNotifyView.as_view()),
     url(r'^v3/user/comments/list$', views.V3CommentsListView.as_view()),

src/weixin/views.py

@@ -830,7 +830,7 @@ class V3PhoneBindView(cv.AuthView):
             return cv.to_fail(e)
 
 
-class V3SignupInfoView(cv.BaseView):
+class V3SignupInfoView(cv.AuthView):
     def get(self, request):
         """#报名信息v3(3.0小程序)
         """
@@ -840,6 +840,16 @@ class V3SignupInfoView(cv.BaseView):
         except Exception as e: 
             return cv.to_fail(e)
 
+class V3SignupWebView(cv.BaseView):
+    def get(self, request):
+        """#报名信息v3(3.0小程序)
+        """
+        try:
+            rst = ctl.get_signup_info(request)
+            return cv.to_suc(rst)
+        except Exception as e: 
+            return cv.to_fail(e)
+        
 
 class V3SignupWXPayView(cv.AuthView):
     def post(self, request):

templates/topic/xsSignup.html

@@ -119,7 +119,7 @@
                 getData(){
                     $.ajax({
                                 type: 'GET',
-                                url: '/api/wx/v3/signup/info',
+                                url: '/api/wx/v3/signup/web',
                                 data: {},
                                 contentType: "application/json", 
                                 dataType: 'json',

templates/topic/ykSignup.html

@@ -87,7 +87,7 @@
                 getData(){
                     $.ajax({
                                 type: 'GET',
-                                url: '/api/wx/v3/signup/info',
+                                url: '/api/wx/v3/signup/web',
                                 data: {},
                                 contentType: "application/json", 
                                 dataType: 'json',