diff --git a/test_client/src/views/exam/index.vue b/test_client/src/views/exam/index.vue index d4eba4f..6a1129f 100644 --- a/test_client/src/views/exam/index.vue +++ b/test_client/src/views/exam/index.vue @@ -51,7 +51,7 @@ diff --git a/test_mini/pages/admin/exam/index.js b/test_mini/pages/admin/exam/index.js index b22f606..90549b5 100644 --- a/test_mini/pages/admin/exam/index.js +++ b/test_mini/pages/admin/exam/index.js @@ -1,4 +1,5 @@ // pages/admin/exam/index.js +const api = require("../../../utils/request.js"); Page({ /** @@ -12,7 +13,13 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + wx.showLoading({ + title: '正在查询...', + }) + api.requesta('/examtest/exam/', 'GET').then(res=>{ + wx.hideLoading() + this.setData(res.data) + }).catch(wx.hideLoading()) }, /** diff --git a/test_mini/pages/admin/exam/index.wxml b/test_mini/pages/admin/exam/index.wxml index cc138e1..db32933 100644 --- a/test_mini/pages/admin/exam/index.wxml +++ b/test_mini/pages/admin/exam/index.wxml @@ -1,2 +1,28 @@ - -pages/admin/exam/index.wxml + + + 已发布的考试,共{{count}}场 + + +

+ {{item.workscope_name}} + {{item.name}} +

+ + 考试地点:{{item.place}} + + + 开关时间:{{item.opentime}}-{{item.closetime}} + + + 监考人:{{item.proctor_name}}-{{item.proctor_phone}} + +
+
+ +
+
\ No newline at end of file diff --git a/test_mini/pages/admin/index.js b/test_mini/pages/admin/index.js index 6846dd2..6857d98 100644 --- a/test_mini/pages/admin/index.js +++ b/test_mini/pages/admin/index.js @@ -28,13 +28,21 @@ Page({ // 发送 res.code 到后台换取 openId, sessionKey, unionId api.requesta('/rbac/user/bindmp/','POST', {code:res.code}).then(res=>{ getApp().globalData.admininfo.mpopenid = res.data.mpopenid - wx.redirectTo({ - url: '/pages/admin/index', - }) + this.setData({ + 'admininfo.mpopenid':res.data.mpopenid + }) }) } }) }, + unbindmp: function(){ + api.requesta('/rbac/user/unbindmp/','POST').then(res=>{ + getApp().globalData.admininfo.mpopenid = null + this.setData({ + 'admininfo.mpopenid':null + }) + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/test_mini/pages/admin/index.wxml b/test_mini/pages/admin/index.wxml index 6192f0e..d95310b 100644 --- a/test_mini/pages/admin/index.wxml +++ b/test_mini/pages/admin/index.wxml @@ -22,6 +22,7 @@ + diff --git a/test_mini/project.config.json b/test_mini/project.config.json index 028731e..bc25de0 100644 --- a/test_mini/project.config.json +++ b/test_mini/project.config.json @@ -21,15 +21,13 @@ "checkSiteMap": true, "uploadWithSourceMap": true, "compileHotReLoad": false, - "useMultiFrameRuntime": true, + "useMultiFrameRuntime": false, "useApiHook": true, - "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, - "enableEngineNative": false, "bundle": false, "useIsolateContext": true, "useCompilerModule": true, diff --git a/test_server/examtest/serializers.py b/test_server/examtest/serializers.py index d7f668e..94b1d9f 100644 --- a/test_server/examtest/serializers.py +++ b/test_server/examtest/serializers.py @@ -186,9 +186,10 @@ class ConsumerSimpleSerializer(serializers.ModelSerializer): class Meta: model = Consumer fields = ['id', 'name', 'ID_number1', 'comanyname', 'deptname', 'username'] + class ExamTestDetailSerializer(serializers.ModelSerializer): """ - 考试详情序列化(导出用) + 考试详情序列化(导出用);目前是正式考试,用户详情从consumer_detail获取 """ workscope_name = serializers.StringRelatedField(source='workscope', read_only=True) paper_name = serializers.StringRelatedField(source='paper', ) diff --git a/test_server/rbac/views/user.py b/test_server/rbac/views/user.py index b481c0e..c74aa99 100644 --- a/test_server/rbac/views/user.py +++ b/test_server/rbac/views/user.py @@ -179,5 +179,15 @@ class UserViewSet(PageOrNot, ModelViewSet): user.mpopenid = openid user.save() return Response({'mpopenid':openid}) + + @action(methods=['post'], detail=False, permission_classes=[IsAuthenticated]) + def unbindmp(self, request, pk=None): + """ + 解绑微信 + """ + user = request.user + user.mpopenid = None + user.save() + return Response() diff --git a/test_server/tmp/examtest - 副本.docx b/test_server/tmp/examtest - 副本.docx new file mode 100644 index 0000000..0d384bb Binary files /dev/null and b/test_server/tmp/examtest - 副本.docx differ diff --git a/test_server/tmp/examtest.docx b/test_server/tmp/examtest.docx index 0d384bb..a53bc75 100644 Binary files a/test_server/tmp/examtest.docx and b/test_server/tmp/examtest.docx differ diff --git a/test_server/tmp/~$amtest - 副本.docx b/test_server/tmp/~$amtest - 副本.docx new file mode 100644 index 0000000..913aee8 Binary files /dev/null and b/test_server/tmp/~$amtest - 副本.docx differ diff --git a/test_server/tmp/~$amtest.docx b/test_server/tmp/~$amtest.docx new file mode 100644 index 0000000..913aee8 Binary files /dev/null and b/test_server/tmp/~$amtest.docx differ