From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageBookService/pages/psychologyAnswer/psychologyAnswer.js |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/packageBookService/pages/psychologyAnswer/psychologyAnswer.js b/packageBookService/pages/psychologyAnswer/psychologyAnswer.js
index a913ecf..02f47f5 100644
--- a/packageBookService/pages/psychologyAnswer/psychologyAnswer.js
+++ b/packageBookService/pages/psychologyAnswer/psychologyAnswer.js
@@ -13,7 +13,7 @@
     dataList: "",
     barHeight: "",
     navBarHeight: "",
-    loading: false,
+    loading: true,
     answerTitle: "", // 瀵艰埅鏍忔爣棰�
     submitStatus: false, // 鎻愪氦鐘舵��
     currentIndex: 0, // 褰撳墠鏄剧ず鐨勯鍙�
@@ -289,6 +289,7 @@
       showId: lastItem.id
     });
   },
+
   // 鎴戠殑閿欓锛屾敹钘忔煡鐪嬭В鏋愭寜閽�
   viewParsing() {
     if (
@@ -387,6 +388,12 @@
         radioChange(citem)
       }
     }
+    const listLength = this.data.questionDataList.length - 1
+    if (this.data.currentIndex < listLength) {
+      this.setData({
+        currentIndex: this.data.currentIndex + 1
+      })
+    }
   },
   // 杈撳叆妗嗚Е鍙�
   onChangeInput(e) {
@@ -484,9 +491,6 @@
     });
     this.setData({
       loading: false,
-      showDialog: false,
-    });
-    this.setData({
       isShowDialog: true,
       submitStatus: true,
     });
@@ -494,7 +498,8 @@
   // 鍒濆鍖栧嚱鏁�
   async init(isReset) {
     this.setData({
-      loading: false,
+      isShowDialog: false,
+      loading: true,
     });
     const questuionName = this.data.questuionName
     const questuionList = pastData.postData.list
@@ -651,6 +656,7 @@
   },
   async restart() {
     this.setData({
+      isShowDialog: false,
       currentIndex: 0,
       submitStatus: false,
     });
@@ -714,25 +720,24 @@
           this.setData({
             questionDataList: newArr,
             scoreDataList: scoreArr,
+            loading: false,
           })
         } catch (error) {
           this.setData({
             questionDataList: newArr,
-            scoreDataList: scoreArr
+            scoreDataList: scoreArr,
+            loading: false,
           })
           console.log(error);
         }
+        const e = {
+          detail: {
+            index: 0
+          }
+        };
+        this.changeSwiper(e)
       });
   },
-
-
-
-
-
-
-
-
-
 
   // 璁板綍妯¤�冪瓟棰樻暟鎹�
   saveMockData() {

--
Gitblit v1.9.1