diff --git a/api/index.js b/api/index.js index ac03429..a93ce25 100644 --- a/api/index.js +++ b/api/index.js @@ -76,5 +76,6 @@ export const getHistoricalApprovalRecords = (params) => post("/app/Task/getHis", /** * 获取班级管理分页列表 */ -export const getClassList = (params) => post("/app/stagestudentrelation/pageTaskByUser", params); +export const getClassList = (params) => post("/app/stagestudentrelation/pageTaskByUser", params); //获取班级列表 +export const joinClass = (params) => post("/app/student/joinClass", params); //实名认证信息提交 // ********************* end *********************** diff --git a/pages/train_management/index.vue b/pages/train_management/index.vue index 2fdae96..dfbca50 100644 --- a/pages/train_management/index.vue +++ b/pages/train_management/index.vue @@ -11,30 +11,30 @@ - {{ item.unit }} + {{ item.corpinfoName }} - {{ item.trainStartTime }} + {{ item.startTime }} - {{ item.trainEndTime }} + {{ item.endTime }} - {{ handleCalcTaskStatus(item.taskStatus) }} + {{ handleCalcTaskStatus(item.state) }} - - @@ -57,8 +57,10 @@ totalPage: 0, trainList: [], taskStatusMap: { - 0: '未开始', - 1: '进行中' + 1: "待完善", + 4: "待开班", + 5: "培训中", + 6: "培训结束" } } }, @@ -92,37 +94,43 @@ * 右上角自定义扫码图标触发事件 */ onNavigationBarButtonTap(e) { - // 只允许通过手机相机扫码 - uni.scanCode({ - // scanType: ['qrCode'], // 仅支持二维码扫码 - onlyFromCamera: false, // 是否只能从相机扫码,不允许从相册选择图片 - hideAlbum: false, // 隐藏相册,不允许从相册选择图片,只能从相机扫码 - success: function(res) { - if (res.result === '0') { - // 签到二维码方式进入 - uni.$u.route({ - url: '/pages/train_management/realname_info_auth', - params: { - type: 'scan_face', - } - }) - } else if (res.result === '1') { - // 考试二维码方式进入 - uni.$u.route({ - url: '/pages/train_management/face_authentication', - params: { - type: 'learning_certification' - } - }) - } - }, - fail: function(error) { - console.log("error :>> ", error) - }, - complete: function(result) { - console.log("扫码完成,正在跳转功能页!") + uni.$u.route({ + url: '/pages/train_management/realname_info_auth', + params: { + type: 'scan_face', } - }); + }) + // 只允许通过手机相机扫码 + // uni.scanCode({ + // // scanType: ['qrCode'], // 仅支持二维码扫码 + // onlyFromCamera: false, // 是否只能从相机扫码,不允许从相册选择图片 + // hideAlbum: false, // 隐藏相册,不允许从相册选择图片,只能从相机扫码 + // success: function(res) { + // if (res.result === '0') { + // // 签到二维码方式进入 + // uni.$u.route({ + // url: '/pages/train_management/realname_info_auth', + // params: { + // type: 'scan_face', + // } + // }) + // } else if (res.result === '1') { + // // 考试二维码方式进入 + // uni.$u.route({ + // url: '/pages/train_management/face_authentication', + // params: { + // type: 'learning_certification' + // } + // }) + // } + // }, + // fail: function(error) { + // console.log("error :>> ", error) + // }, + // complete: function(result) { + // console.log("扫码完成,正在跳转功能页!") + // } + // }); }, handleCalcTaskStatus(type) { return this.taskStatusMap[type] diff --git a/pages/train_management/realname_info_auth.vue b/pages/train_management/realname_info_auth.vue index 148d1a8..6c750d0 100644 --- a/pages/train_management/realname_info_auth.vue +++ b/pages/train_management/realname_info_auth.vue @@ -9,12 +9,12 @@ - + - - + + - - - + + @@ -67,10 +67,14 @@ '--picker-header-radius': '24rpx 24rpx 0 0', '--picker-confirm-radius': '12rpx' }" @confirm="handleCertificateGetTimeConfirm" @cancel="handleCertificateGetTimeCancel"> + +