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 |   92 ++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/learnTask/index.js b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
index 8cf3f61..ba388c3 100644
--- a/packageBookService/pages/bookServices/detail/components/learnTask/index.js
+++ b/packageBookService/pages/bookServices/detail/components/learnTask/index.js
@@ -33,7 +33,22 @@
     dialogVisible: false,
     invitee: "",
     teacherEvaluated: false,
-    evaluated: false
+    evaluated: false,
+    rowCol: [{
+        width: '50%',
+      },
+      {
+        width: '100%'
+      },
+      {
+        width: '80%'
+      },
+      {
+        width: '100%'
+      }, {
+        width: '100%'
+      },
+    ],
   },
   onShow() {
     var that = this;
@@ -54,7 +69,7 @@
       this.setData({
         bookId: options.bookId,
         cmsPath: options.cmsPath,
-        taskId: options.bookId,
+        taskId: options.taskId,
         consumer: options.consumer,
         userId: options.userId,
         userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).nickName
@@ -63,7 +78,7 @@
         this.setData({
           cmsPath: options.cmsPath,
           bookId: options.bookId,
-          taskId: options.bookId,
+          taskId: options.taskId,
           consumer: options.consumer,
           userId: options.userId,
           disabled: true
@@ -161,7 +176,7 @@
             menuList: dataList,
             loading: false,
           });
-        }, 500)
+        }, 200)
         if (this.data.taskId) {
           setTimeout(() => {
             this.data.menuList.forEach((item) => {
@@ -179,7 +194,7 @@
                 })
               }
             })
-          }, 500)
+          }, 200)
         } else {
           setTimeout(() => {
             if (this.data.menuList[0].children) {
@@ -191,10 +206,12 @@
                 taskInfo: this.data.menuList[0],
               });
             }
-          }, 500)
+          }, 200)
         }
       }
-      this.getTasksList()
+      setTimeout(() => {
+        this.getTasksList()
+      }, 200)
     })
   },
   getTask(e) {
@@ -229,7 +246,6 @@
       this.setData({
         tasksListData: res.datas,
       });
-
       if (this.data.taskInfo.name) {
         this.taskSelect(this.data.taskInfo)
       }
@@ -249,25 +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,
-                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 = ''
-                //   }
-                // })
+              if (this.data.name && this.data.school && this.data.class) {
                 this.setData({
-                  dataList: content.evaluate,
-                });
+                  taskShow: true,
+                })
+                this.getChildTasksList()
+                if (content.evaluate.length > 0) {
+                  this.setData({
+                    dataList: content.evaluate,
+                  });
+                }
+              } else {
+                wx.showToast({
+                  title: "璇峰厛濉啓涓汉淇℃伅",
+                  icon: 'none',
+                  duration: 1000
+                })
               }
             }
           } else {
@@ -311,9 +329,6 @@
           item.teacherEvaluation = ''
         })
       }
-      this.setData({
-
-      });
       if (this.data.name && this.data.school && this.data.class) {
         this.setData({
           dataList: res.datas.cmsDatas[0].datas,
@@ -576,19 +591,16 @@
   },
 
   confirmBtn() {
-    if (this.data.invitee == 'teacher' && this.data.teacherEvaluated) {
-      wx.showToast({
-        title: "鏁欏笀宸茬粡璇勪环锛屼笉鑳藉啀閭�璇锋暀甯堣瘎浠凤紒",
-        icon: 'none',
-        duration: 1000
-      })
-      return false
-    } else {
-      wx.showShareMenu({
-        withShareTicket: true
-      });
-    }
-
+    wx.showShareMenu({
+      withShareTicket: true
+    });
+  },
+  confirmBtn1() {
+    wx.showToast({
+      title: "鏁欏笀宸茬粡璇勪环锛屼笉鑳藉啀閭�璇锋暀甯堣瘎浠凤紒",
+      icon: 'none',
+      duration: 1000
+    })
   },
   submitComment() {
     let mateEvaluationList = []

--
Gitblit v1.9.1