From 339603d4b74f9d3bbfe037709d915d5fbc38c9aa Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 27 九月 2024 17:10:25 +0800
Subject: [PATCH] rwd
---
packageBookService/pages/bookServices/detail/components/learnTask/index.js | 32 +++++++++++++++-----------------
packageBookService/pages/bookServices/detail/components/learnTask/index.wxml | 1 +
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.js b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
index 623da29..ba388c3 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.js
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
@@ -265,29 +265,27 @@
this.setData({
isUpdate: true,
tasksData: item1,
- name: content.userName,
- school: content.school,
- class: content.class,
+ name: this.data.name || content.userName,
+ school: this.data.school || content.school,
+ class: this.data.class || content.class,
learnTime: content.learnTime,
});
if (this.data.name && this.data.school && this.data.class) {
this.setData({
taskShow: true,
})
- }
- this.getChildTasksList()
- if (content.evaluate.length > 0) {
- // content.evaluate.forEach((element) => {
- // if (this.data.consumer == 'classmate') {
- // element.mateEvaluation = ''
- // }
- // if (this.data.consumer == 'teacher') {
- // element.teacherEvaluation = ''
- // }
- // })
- this.setData({
- dataList: content.evaluate,
- });
+ this.getChildTasksList()
+ if (content.evaluate.length > 0) {
+ this.setData({
+ dataList: content.evaluate,
+ });
+ }
+ } else {
+ wx.showToast({
+ title: "璇峰厛濉啓涓汉淇℃伅",
+ icon: 'none',
+ duration: 1000
+ })
}
}
} else {
diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.wxml b/packageBookService/pages/bookServices/detail/components/learnTask/index.wxml
index d611c2d..0f71b75 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.wxml
@@ -166,6 +166,7 @@
<t-button class="btn" theme="primary" bind:tap="handleClose">
<view slot="content" class="btn-content">鍙栨秷</view>
</t-button>
+
<t-button class="btn" theme="primary" bind:tap="confirmBtn1" wx:if="{{invitee == 'teacher' &&teacherEvaluated}}">
<view slot="content" class="btn-content">纭畾</view>
</t-button>
--
Gitblit v1.9.1