From e24d67b2cbec98c736e47cee7b85b282a58fe2b9 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 27 Jul 2020 17:50:45 +0800
Subject: [PATCH] question img

---
 test_mini/app.js                    | 2 +-
 test_mini/pages/test/detail.wxml    | 1 +
 test_mini/project.config.json       | 4 ++--
 test_server/examtest/serializers.py | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test_mini/app.js b/test_mini/app.js
index af25636..1320ac0 100644
--- a/test_mini/app.js
+++ b/test_mini/app.js
@@ -59,7 +59,7 @@ App({
     userinfo: {}, // 服务器传回的消费者信息
     host: 'https://apitest.ahctc.cn',
     mediahost: 'https://apitest.ahctc.cn',
-    //host: 'http://127.0.0.1:8000',
+    //host: 'http://127.0.0.1:8011',
     //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 5f25fe4..69faf0c 100644
--- a/test_mini/pages/test/detail.wxml
+++ b/test_mini/pages/test/detail.wxml
@@ -5,6 +5,7 @@
   <view class="weui-article">
     <view class="weui-article__h2">{{tm_index+1}}.
     <span class="txlabel">{{tm_current.question.type}}</span>
+    <span style="color:gray">({{tm_current.question.questioncat_name}})</span>
     </view>
     <view class="weui-article__title">{{tm_current.question.name}}</view>
     <view wx:if="{{tm_current.img}}" style="text-align:center"><image src="{{tm_current.img}}" mode="aspectFit"></image></view>
diff --git a/test_mini/project.config.json b/test_mini/project.config.json
index ff08581..9fb87b8 100644
--- a/test_mini/project.config.json
+++ b/test_mini/project.config.json
@@ -23,9 +23,9 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
 		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.10.3",
diff --git a/test_server/examtest/serializers.py b/test_server/examtest/serializers.py
index dd656af..f1fb29e 100644
--- a/test_server/examtest/serializers.py
+++ b/test_server/examtest/serializers.py
@@ -85,13 +85,13 @@ class ExamTestListSerializer(serializers.ModelSerializer):
         """ Perform necessary eager loading of data. """
         queryset = queryset.select_related('consumer','paper', 'workscope')
         return queryset
-
+from question.serializers import QuestionSerializer
 class AnswerDetailSerializer(serializers.ModelSerializer):
+    question = QuestionSerializer()
     class Meta:
         model = AnswerDetail
         exclude = ('examtest',)
         # fields = '__all__'
-        depth = 1
 
     @staticmethod
     def setup_eager_loading(queryset):
@@ -130,6 +130,7 @@ class PaperQuestionsDetailSerializer(serializers.ModelSerializer):
     options = serializers.ReadOnlyField(source='question.options')
     right = serializers.ReadOnlyField(source='question.right')
     type = serializers.ReadOnlyField(source='question.type')
+    img = serializers.ReadOnlyField(source='question.img')
     questioncat_name = serializers.ReadOnlyField(source='question.questioncat.name')
     level = serializers.ReadOnlyField(source='question.level')
     class Meta: