diff --git a/test_mini/app.js b/test_mini/app.js index 75f30df..4e9ce27 100644 --- a/test_mini/app.js +++ b/test_mini/app.js @@ -69,9 +69,9 @@ App({ globalData: { userInfo: {}, userinfo: {}, // 服务器传回的消费者信息 - //host: 'https://apitest.ahctc.cn', + host: 'https://apitest.ahctc.cn', mediahost: 'https://apitest.ahctc.cn', - host: 'http://127.0.0.1:8000', + //host: 'http://127.0.0.1:8000', //mediahost: 'http://127.0.0.1:8000', token : '', } diff --git a/test_mini/pages/test/detail.wxml b/test_mini/pages/test/detail.wxml index 740381c..abd7706 100644 --- a/test_mini/pages/test/detail.wxml +++ b/test_mini/pages/test/detail.wxml @@ -8,7 +8,8 @@ ({{tm_current.question.questioncat_name}}) - + + diff --git a/test_mini/project.config.json b/test_mini/project.config.json index 251a781..ba4292c 100644 --- a/test_mini/project.config.json +++ b/test_mini/project.config.json @@ -25,7 +25,7 @@ "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": true, + "useCompilerModule": false, "userConfirmedUseCompilerModuleSwitch": false, "compileHotReLoad": false, "useMultiFrameRuntime": false, diff --git a/test_server/analyse/views.py b/test_server/analyse/views.py index 52c96b4..a2e0b89 100644 --- a/test_server/analyse/views.py +++ b/test_server/analyse/views.py @@ -101,9 +101,10 @@ class Companydis(APIView): """ def get(self, request, format=None): ret = {'s':[], 't':'单位分布', 'max':300, 'min':0} - tmp = Company.objects.exclude(geo__isnull=True).values('geo__pname').annotate(total=Count('geo__pname')) + tmp = Company.objects.exclude(geo__pname__isnull=True).values('geo__pname').annotate(total=Count('geo__pname')) for i in tmp: - ret['s'].append({'name':nameMap[i['geo__pname']], 'value':i['total']}) + if i['geo__pname'] in nameMap: + ret['s'].append({'name':nameMap[i['geo__pname']], 'value':i['total']}) return Response(ret) class Consumerdis(APIView): @@ -112,9 +113,10 @@ class Consumerdis(APIView): """ def get(self, request, format=None): ret = {'s':[], 't':'学员分布', 'max':600, 'min':0} - tmp = Consumer.objects.exclude(company__geo__isnull=True).values('company__geo__pname').annotate(total=Count('company__geo__pname')) + tmp = Consumer.objects.exclude(company__geo__pname__isnull=True).values('company__geo__pname').annotate(total=Count('company__geo__pname')) for i in tmp: - ret['s'].append({'name':nameMap[i['company__geo__pname']], 'value':i['total']}) + if i['company__geo__pname'] in nameMap: + ret['s'].append({'name':nameMap[i['company__geo__pname']], 'value':i['total']}) return Response(ret) class Quota(APIView): '''