From 3da6ffc4aec5feac593990d3959a6dde71a60716 Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Thu, 17 Apr 2025 20:23:36 +0800 Subject: [PATCH] 0417-4 --- newPages/messageCenter/index.vue | 6 +++++- pagesA/examinationList/index.vue | 11 ++++++++++- pagesA/register/index.vue | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/newPages/messageCenter/index.vue b/newPages/messageCenter/index.vue index aac607e..a41b330 100644 --- a/newPages/messageCenter/index.vue +++ b/newPages/messageCenter/index.vue @@ -13,7 +13,8 @@ 系统通知 {{item.templateContent}} - {{formatTime(item.createTime)}} + {{formatTime(item.createTime)}} + @@ -195,6 +196,7 @@ flex: 1; display: flex; flex-direction: column; + height: 100%; .itemContent { flex: 1; // 核心:scroll-view 占满剩余空间 @@ -202,6 +204,8 @@ flex-direction: column; padding: 0 20rpx; box-sizing: border-box; + width: 100%; + overflow: hidden; } } diff --git a/pagesA/examinationList/index.vue b/pagesA/examinationList/index.vue index 8f1ae30..ac8c499 100644 --- a/pagesA/examinationList/index.vue +++ b/pagesA/examinationList/index.vue @@ -20,7 +20,7 @@ {{ item.courseName }} - {{ item.examScore }} + {{ item.examScore }} {{ '--' }} {{ getStatusText(item.ifPassStatus) }} @@ -119,6 +119,10 @@ this.getExamList() }) }, + onShow() { + this.getExamList() + this.getCourseList() + }, onReady() { // 动态计算滚动区域高度 this.calculateScrollHeight(); @@ -324,6 +328,11 @@ text: '成绩录入', type: 'input' } + } else if (!item.ifPass && !item.ifEvaluate) { + return { + text: '开始评价', + type: 'evaluate' + } } else if (!item.ifPass) { return { text: '2', diff --git a/pagesA/register/index.vue b/pagesA/register/index.vue index a81beca..c5ed1cd 100644 --- a/pagesA/register/index.vue +++ b/pagesA/register/index.vue @@ -458,7 +458,7 @@ // 表单校验 async validateForm() { - if (!this.sfzimg) { + if (!this.isDisabled && !this.sfzimg) { uni.showToast({ title: '请上传身份证照片', icon: 'error'