From 167268be505d35d4ebd203864e939ef21784fd19 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 15 Dec 2020 17:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B4=A6=E6=88=B7=E7=99=BB?= =?UTF-8?q?=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/safesite/views.py b/safesite/views.py index 24758a8f..fd509d48 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -3736,12 +3736,15 @@ def bindmp(req): username = data['username'] password = data['password'] mpopenid = data['mpopenid'] - userinfo = data['userInfo'] + userinfo = data.get('userinfo', None) # print(username,password,mpopenid) user = User.objects.filter(username=username, deletemark=1) if user.exists(): if check_password(password, user[0].epassword): - user.update(mpopenid=mpopenid,headimgurl=userinfo['avatarUrl'],nickname=userinfo['nickName']) + if userinfo: + user.update(mpopenid=mpopenid,headimgurl=userinfo['avatarUrl'],nickname=userinfo['nickName']) + else: + user.update(mpopenid=mpopenid) return JsonResponse({"code": 1}) else: return JsonResponse({"code": 0}) @@ -6324,17 +6327,11 @@ def apiexamtest(req): objs = ExamTestDetail.objects.filter(examtest__id=id).order_by('-score','-took').values( 'id', 'user__name', 'user__ubelongpart__partname', 'took', 'score', 'remainnum', 'passcode','starttime', 'testnum') a['cjrydetail'] = list(objs) - a['remainnum'] = 0 - a['testnum'] = 0 - queryset = ExamTestDetail.objects.filter(examtest__id=id,user__userid=userid) - if queryset.exists(): - a['remainnum'] = queryset[0].remainnum - a['testnum'] = queryset[0].testnum return HttpResponse(json.dumps(a, cls=MyEncoder), content_type="application/json") elif a == 'detail': id = req.GET.get('id') a = ExamTest.objects.filter(id=id).values('id', 'num', 'name', 'starttime', 'endtime', 'duration', 'totalscore', - 'passscore', 'exampaper__total', 'createtime', 'state', 'exampaper__name', 'createuser__name', 'type', 'qrcode', 'testnum')[0] + 'passscore', 'exampaper__total', 'createtime', 'state', 'exampaper__name', 'createuser__name', 'type', 'qrcode', 'testnum', 'ispublic')[0] a['notinTime'] = 0 if a['starttime'] > datetime.now(): a['notinTime'] = 1 @@ -6342,8 +6339,12 @@ def apiexamtest(req): a['notinTime'] = 1 a['remainnum'] = 0 a['testnum'] = 0 + a['canks'] = 0 # 本人是否可参加 + if a['ispublic'] == 1: + a['canks'] = 1 queryset = ExamTestDetail.objects.filter(examtest__id=id,user__userid=userid) if queryset.exists(): + a['canks'] = 1 a['remainnum'] = queryset[0].remainnum a['testnum'] = queryset[0].testnum return HttpResponse(json.dumps(a, cls=MyEncoder), content_type="application/json")