diff --git a/pages/certificate_information/add.vue b/pages/certificate_information/add.vue index 5dd30d9..9a032b1 100644 --- a/pages/certificate_information/add.vue +++ b/pages/certificate_information/add.vue @@ -435,8 +435,7 @@ export default { }, 2000) }).catch((e) => { console.info(e) - // uni.$u.toast('请补全必填项') - uni.$u.toast(e) + uni.$u.toast('请补全必填项') }) } }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 8731e5e..38df129 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -26,16 +26,9 @@ - + @@ -45,220 +38,255 @@ diff --git a/pages/train_management/face_authentication.nvue b/pages/train_management/face_authentication.nvue index 430ccde..968d07c 100644 --- a/pages/train_management/face_authentication.nvue +++ b/pages/train_management/face_authentication.nvue @@ -43,6 +43,7 @@ }, 1000) }, onLoad(query) { + console.log('query: >> ', query) // facial_input 人脸认证 isFirst 1 第一次登录添加人脸 // scan_face 扫码 // update_facial_input 更新人脸 @@ -61,25 +62,18 @@ // this.showButton = query.showButton || "yes"; this.routeQueryparams = query ?? {} }, - onBackPress(event) { - // if (event.from === 'backbutton') { - // if ((this.type === 'scan_face' && this.isFirst === '1') || this.type === 'learning_certification' || this.type === 'facial_input') { - // uni.$u.toast('请完成人脸验证') - // return true - // } - // } - if (this.type === 'facial_input') { - uni.$u.route({ - type: 'redirect', - url: '/pages/index/index', - }) - } - return false - }, + // onBackPress(event) { + // return false + // }, onUnload() { this.startPreviewTimer && clearInterval(this.startPreviewTimer) }, methods: { + handleBack() { + uni.navigateBack({ + delta: 2, + }) + }, snapshot() { uni.showLoading({ title: '加载中' diff --git a/pages/train_management/index.vue b/pages/train_management/index.vue index f16c27f..707d6ba 100644 --- a/pages/train_management/index.vue +++ b/pages/train_management/index.vue @@ -31,7 +31,7 @@ {{ handleCalcTaskStatus(item.state) }} - + @@ -46,7 +46,7 @@