diff --git a/test_mini/pages/main/main.js b/test_mini/pages/main/main.js
index 09d40e6..c2cd933 100644
--- a/test_mini/pages/main/main.js
+++ b/test_mini/pages/main/main.js
@@ -14,7 +14,10 @@ Page({
autoplay: true,
interval: 7000,
duration: 1500,
- nowWork:null
+ nowWork:null,
+ msgList: [
+ { title: "欢迎使用中科辐射学堂!" },
+ { title: "如有疑问,请致电课程顾问师老师:18355135390" },]
},
imgH: function (e) {
let winWid = wx.getSystemInfoSync().windowWidth;
@@ -106,7 +109,7 @@ Page({
})
}else{
wx.showToast({
- title: '未开通权限\r\n请联系课程顾问',
+ title: '未开通权限\r\n请致电18355135390',
icon: 'none',
duration: 2000
})
@@ -118,7 +121,7 @@ Page({
this.genPaper(workscope)
} else {
wx.showToast({
- title: '未开通权限\r\n请联系课程顾问',
+ title: '未开通权限\r\n请致电18355135390',
icon: 'none',
duration: 2000
})
diff --git a/test_mini/pages/main/main.wxml b/test_mini/pages/main/main.wxml
index 25c1725..c4f49f5 100644
--- a/test_mini/pages/main/main.wxml
+++ b/test_mini/pages/main/main.wxml
@@ -9,6 +9,13 @@
+
+
+
+{{item.title}}
+
+
+
diff --git a/test_mini/pages/main/main.wxss b/test_mini/pages/main/main.wxss
index e69de29..f6933b3 100644
--- a/test_mini/pages/main/main.wxss
+++ b/test_mini/pages/main/main.wxss
@@ -0,0 +1,14 @@
+.swiper_container {
+margin-top:12rpx;
+height: 50rpx;
+width: 100%;
+text-align: center
+}
+.swiper_item {
+font-size: 30rpx;
+font-weight: bold;
+color:darkblue;
+overflow: hidden;
+text-overflow: ellipsis;
+white-space: nowrap;
+}
\ No newline at end of file
diff --git a/test_mini/pages/test/list.js b/test_mini/pages/test/list.js
index 958c070..efe0672 100644
--- a/test_mini/pages/test/list.js
+++ b/test_mini/pages/test/list.js
@@ -35,7 +35,7 @@ Page({
},
getList: function () {
var that = this
- api.request('/examtest/examtest/self', 'GET', that.data.query).then(res => {
+ api.request('/examtest/examtest/self', 'POST', that.data.query).then(res => {
if (that.data.query.page == 1) {
that.data.results = res.data.results
} else {
diff --git a/test_server/examtest/views.py b/test_server/examtest/views.py
index f0e94c7..284c22e 100644
--- a/test_server/examtest/views.py
+++ b/test_server/examtest/views.py
@@ -167,7 +167,7 @@ class ExamTestViewSet(ModelViewSet):
filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
filterset_fields = ['type','is_pass']
- @action(methods=['get'], detail=False,url_path='self', url_name='selftest', perms_map = [{'*':'my_examtest'}])
+ @action(methods=['get','post'], detail=False,url_path='self', url_name='selftest', perms_map = [{'*':'my_examtest'}])
def selftest(self, request, pk=None):
'''
个人考试记录
diff --git a/test_server/utils/custom.py b/test_server/utils/custom.py
index f7982c8..56c4d74 100644
--- a/test_server/utils/custom.py
+++ b/test_server/utils/custom.py
@@ -21,55 +21,55 @@ class CommonPagination(PageNumberPagination):
"""
page_size = 10
page_size_query_param = 'limit'
- # def paginate_queryset(self, queryset, request, view=None):
- # """
- # 重写该方法,确保post请求也可分页
- # """
- # page_size = self.get_page_size(request)
- # if not page_size:
- # return None
+ def paginate_queryset(self, queryset, request, view=None):
+ """
+ 重写该方法,确保post请求也可分页
+ """
+ page_size = self.get_page_size(request)
+ if not page_size:
+ return None
- # paginator = self.django_paginator_class(queryset, page_size)
- # if self.page_query_param in request.query_params:
- # page_number = request.query_params.get(self.page_query_param)
- # elif self.page_query_param in request.data:
- # page_number = request.data.get(self.page_query_param)
- # else:
- # page_number = 1
- # if page_number in self.last_page_strings:
- # page_number = paginator.num_pages
+ paginator = self.django_paginator_class(queryset, page_size)
+ if self.page_query_param in request.query_params:
+ page_number = request.query_params.get(self.page_query_param)
+ elif self.page_query_param in request.data:
+ page_number = request.data.get(self.page_query_param)
+ else:
+ page_number = 1
+ if page_number in self.last_page_strings:
+ page_number = paginator.num_pages
- # try:
- # self.page = paginator.page(page_number)
- # except InvalidPage as exc:
- # msg = self.invalid_page_message.format(
- # page_number=page_number, message=str(exc)
- # )
- # raise NotFound(msg)
+ try:
+ self.page = paginator.page(page_number)
+ except InvalidPage as exc:
+ msg = self.invalid_page_message.format(
+ page_number=page_number, message=str(exc)
+ )
+ raise NotFound(msg)
- # if paginator.num_pages > 1 and self.template is not None:
- # # The browsable API should display pagination controls.
- # self.display_page_controls = True
+ if paginator.num_pages > 1 and self.template is not None:
+ # The browsable API should display pagination controls.
+ self.display_page_controls = True
- # self.request = request
- # return list(self.page)
+ self.request = request
+ return list(self.page)
- # def get_page_size(self, request):
- # if self.page_size_query_param:
- # try:
- # if self.page_size_query_param in request.query_params:
- # page_size = request.query_params.get(self.page_size_query_param)
- # else:
- # page_size = request.data.get(self.page_size_query_param)
- # return _positive_int(
- # page_size,
- # strict=True,
- # cutoff=self.max_page_size
- # )
- # except (KeyError, ValueError):
- # pass
+ def get_page_size(self, request):
+ if self.page_size_query_param:
+ try:
+ if self.page_size_query_param in request.query_params:
+ page_size = request.query_params.get(self.page_size_query_param)
+ else:
+ page_size = request.data.get(self.page_size_query_param)
+ return _positive_int(
+ page_size,
+ strict=True,
+ cutoff=self.max_page_size
+ )
+ except (KeyError, ValueError):
+ pass
- # return self.page_size
+ return self.page_size
class TreeSerializer(serializers.Serializer):