From 875069ac9f6fe00b08cd3d08db113fb3a476919f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 24 Apr 2020 17:33:21 +0800
Subject: [PATCH] export

---
 test_mini/pages/lianxi/main.js | 4 +---
 test_server/crm/views.py       | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test_mini/pages/lianxi/main.js b/test_mini/pages/lianxi/main.js
index e5ebb3d..3686a57 100644
--- a/test_mini/pages/lianxi/main.js
+++ b/test_mini/pages/lianxi/main.js
@@ -10,7 +10,6 @@ Page({
     questioncat: null,
     tms: [],
     ydtms: [],
-    ydtms_old:[],
     ctms: [],
     tm_index: 0,
     answerP: false,
@@ -43,7 +42,6 @@ Page({
       var value = wx.getStorageSync('cat' + that.data.questioncat.toString())
       if (value) {
         that.data.ydtms = value
-        that.data.ydtms_old = value
       }
     } catch (e) {}
     try {
@@ -64,7 +62,7 @@ Page({
     var that = this
     var query = {
       questioncat: that.data.questioncat,
-      ydtms: that.data.ydtms_old
+      ydtms: wx.getStorageSync('cat' + that.data.questioncat.toString())
     }
     api.request('/question/question/exercise/?limit=10&page='+that.data.page, 'POST', query).then(res => {
         that.data.tms = that.data.tms.concat(res.data.results)
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index 2cfa38e..d6769a6 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -228,6 +228,11 @@ class ConsumerViewSet(ModelViewSet):
             m = m + 1
         return Response(status=status.HTTP_200_OK)
 
+    @action(methods=['get'], detail=False,
+            url_path='export', url_name='export_consumer')
+    def export(self, request):
+        queryset = self.filter_queryset(self.queryset)
+        print(queryset)
 
 class ConsumerMPLoginView(APIView):
     """