diff --git a/client_mp/common/http.api.js b/client_mp/common/http.api.js index a9f581b..fdb7fbc 100644 --- a/client_mp/common/http.api.js +++ b/client_mp/common/http.api.js @@ -1,7 +1,6 @@ // 如果没有通过拦截器配置域名的话，可以在这里写上完整的URL(加上域名部分) let hotSearchUrl = '/ebapi/store_api/hot_search'; let indexUrl = '/ebapi/public_api/index'; - // 此处第二个参数vm，就是我们在页面使用的this，你可以通过vm获取vuex等操作，更多内容详见uView对拦截器的介绍部分： // https://uviewui.com/js/http.html#%E4%BD%95%E8%B0%93%E8%AF%B7%E6%B1%82%E6%8B%A6%E6%88%AA%EF%BC%9F const install = (Vue, vm) => { @@ -11,27 +10,17 @@ const install = (Vue, vm) => { }); // 此处使用了传入的params参数，一切自定义即可 let getUserInfo = (params = {}) => vm.$u.get('/system/user/info/', params);//获取用户信息 - let getCode = (params = {}) => vm.$u.post('/system/sendmsg/', params); //获取邮箱验证码 - let codeLogin = (params = {}) => vm.$u.post('/token2/', params); //邮箱验证码登录 - let login = (params = {}) => vm.$u.post('/token/', params); //账户密码登录 // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 - let wxmplogin = (params = {}) => vm.$u.post('/wxmplogin/', params); //微信登录 - let bindmp = (params = {}) => vm.$u.post('/system/user/bindwxmp/', params); //微信绑定 - let unbindmp = (params = {}) => vm.$u.post('/system/user/unbindwxmp/', params); //微信绑定 - let getMyInspectTaskList = (params = {}) => vm.$u.get('/quality/subinspecttask/self/', params); - let getSubinspectTask = (id, params)=> vm.$u.get(`/quality/subinspecttask/${id}/`, params); - //获取子任务涉及的单位 let getSubtaskDepts = (id, params)=> vm.$u.get(`/quality/subinspecttask/${id}/depts/`, params); - //获取子任务单位的详细信息 let getSubtaskDept = (id, params)=> vm.$u.get(`/quality/inspectdept/${id}/`, params); let getInspectRecords = (params)=> vm.$u.get('/quality/inspectrecord/', params); @@ -44,8 +33,6 @@ const install = (Vue, vm) => { let getVideos = (params={})=>vm.$u.get('/vod/video/', params);//点播视频 let getDickey = (params={})=>vm.$u.get('/system/dict/', params);//查询字典 let putMyVideoView =(id)=>vm.$u.put(`/vod/video/${id}/myview/`);//更新本人观看信息 - - //考试有关 let getExamList = (params={})=>vm.$u.get('/exam/exam/', params);//考试列表 let startExam = (id)=>vm.$u.post(`/exam/exam/${id}/start/`);//开始考试 @@ -54,6 +41,7 @@ const install = (Vue, vm) => { let examRecordDetail = (id,params={})=>vm.$u.get(`/exam/examrecord/${id}/`,params);//我的考试记录 let paperDetail = (id,params={})=>vm.$u.get(`/exam/paper/${id}/`,params);//测试 let questionList = (params={})=>vm.$u.get(`/exam/question/`,params);//题目 + let certificateList = (params={})=>vm.$u.get(`/edu/certificate/`,params);//证书列表 vm.$u.api = {getUserInfo, getCode, @@ -83,7 +71,9 @@ const install = (Vue, vm) => { examRecord, paperDetail, questionList, - examRecordDetail + examRecordDetail, + + certificateList }; } diff --git a/client_mp/pages.json b/client_mp/pages.json index f6925b1..751275d 100644 --- a/client_mp/pages.json +++ b/client_mp/pages.json @@ -137,33 +137,33 @@ } } - ,{ - "path" : "pages/exam/test", - "style" : - { - "navigationBarTitleText": "练习", - "enablePullDownRefresh": false - } + // ,{ + // "path" : "pages/exam/test", + // "style" : + // { + // "navigationBarTitleText": "练习", + // "enablePullDownRefresh": false + // } - } - ,{ - "path" : "pages/exam/question", - "style" : - { - "navigationBarTitleText": "专题练习", - "enablePullDownRefresh": false - } + // } + // ,{ + // "path" : "pages/exam/question", + // "style" : + // { + // "navigationBarTitleText": "专题练习", + // "enablePullDownRefresh": false + // } - } - ,{ - "path" : "pages/exam/testDetail", - "style" : - { - "navigationBarTitleText": "练习题目", - "enablePullDownRefresh": false - } + // } + // ,{ + // "path" : "pages/exam/testDetail", + // "style" : + // { + // "navigationBarTitleText": "练习题目", + // "enablePullDownRefresh": false + // } - } + // } ,{ "path" : "pages/exam/exam", "style" : @@ -186,7 +186,7 @@ "path" : "pages/exam/main", "style" : { - "navigationBarTitleText": "答题中", + "navigationBarTitleText": "考试中", "enablePullDownRefresh": false } @@ -195,7 +195,7 @@ "path" : "pages/exam/record", "style" : { - "navigationBarTitleText": "答题记录", + "navigationBarTitleText": "考试记录", "enablePullDownRefresh": false } @@ -204,7 +204,7 @@ "path" : "pages/exam/result", "style" : { - "navigationBarTitleText": "答题结束", + "navigationBarTitleText": "考试结束", "enablePullDownRefresh": false } @@ -212,7 +212,15 @@ "path" : "pages/exam/detail", "style" : { - "navigationBarTitleText": "答题详情", + "navigationBarTitleText": "考试详情", + "enablePullDownRefresh": false + } + + },{ + "path" : "pages/certificate/index", + "style" : + { + "navigationBarTitleText": "证书查询", "enablePullDownRefresh": false } @@ -239,14 +247,14 @@ "pagePath": "pages/exam/index", "iconPath": "static/common/dati.png", "selectedIconPath": "static/common/datic.png", - "text": "答题" - }, - { - "pagePath": "pages/vod/video", - "iconPath": "static/common/play.png", - "selectedIconPath": "static/common/playc.png", - "text": "点播" + "text": "考试" }, + // { + // "pagePath": "pages/vod/video", + // "iconPath": "static/common/play.png", + // "selectedIconPath": "static/common/playc.png", + // "text": "点播" + // }, { "pagePath": "pages/my/my", "iconPath": "static/common/me.png", diff --git a/client_mp/pages/certificate/index.vue b/client_mp/pages/certificate/index.vue new file mode 100644 index 0000000..f646f02 --- /dev/null +++ b/client_mp/pages/certificate/index.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/client_mp/pages/certificate/index1.vue b/client_mp/pages/certificate/index1.vue new file mode 100644 index 0000000..c435e78 --- /dev/null +++ b/client_mp/pages/certificate/index1.vue @@ -0,0 +1,302 @@ + + + + + diff --git a/client_mp/pages/exam/record.vue b/client_mp/pages/exam/record.vue index ed027df..9facd81 100644 --- a/client_mp/pages/exam/record.vue +++ b/client_mp/pages/exam/record.vue @@ -1,32 +1,33 @@