From 0b7803920728865e2b7c2178481a3afce7302ce3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 17 四月 2024 09:20:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageBookService/pages/bookServices/examination/examination.js |   97 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index ceac28b..19c8ee5 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -47,7 +47,8 @@
     sliderValue: 0, // 瀛椾綋婊戝潡
     startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
     pauseTime: 0, //鏆傚仠鏃堕棿
-    showDialog: false // 鏈彁浜ら��鍑烘嫤鎴脊绐�
+    showDialog: false, // 鏈彁浜ら��鍑烘嫤鎴脊绐�
+    showId: ''
   },
 
   /**
@@ -68,9 +69,9 @@
       idPathList: options.idPathList ? JSON.parse(options.idPathList) : [],
       answerType: options.answerType,
     });
-    // wx.setNavigationBarTitle({
-    //   title: options.answerTitle,
-    // })
+    wx.setNavigationBarTitle({
+      title: options.answerTitle,
+    })
     if (this.data.answerType == "mock") {
       this.setData({
         uuid: options.uuid,
@@ -198,7 +199,20 @@
       },
     });
   },
-
+  // 淇敼nav棰滆壊
+  changeNavBarColor(e) {
+    if (type == 'night') {
+      wx.setNavigationBarColor({
+        backgroundColor: '#000000',
+        frontColor: '#ffffff',
+      })
+    } else {
+      wx.setNavigationBarColor({
+        backgroundColor: '#ffffff',
+        frontColor: '#000000',
+      })
+    }
+  },
   // 姝ｅ垯鎵惧嚭鍚姏src
   extractSourceSrc(htmlString) {
     // 姝ｅ垯琛ㄨ揪寮忓尮閰�<source>鏍囩涓殑src灞炴�у��  
@@ -235,26 +249,28 @@
   },
   // 杩斿洖鎷︽埅
   beforeleave() {
-    wx.showModal({
-      title: "鎻愮ず",
-      content: "鏈彁浜わ紝鏄惁閫�鍑虹瓟棰�",
-      confirmColor: "#ff6c00",
-      cancelColor: "#949494",
-      complete: (res) => {
-        if (res.cancel) {
-          this.setData({
-            showDialog: true
-          })
-        }
-        if (res.confirm) {
-          this.setData({
-            submitStatus: true,
-            showDialog: false
-          });
-          wx.navigateBack();
-        }
-      },
-    });
+    if ((this.data.answerType == 'option' || this.data.answerType == 'mock') && !this.data.submitStatus) {
+      wx.showModal({
+        title: "鎻愮ず",
+        content: "鏈彁浜わ紝鏄惁閫�鍑虹瓟棰�",
+        confirmColor: "#ff6c00",
+        cancelColor: "#949494",
+        complete: (res) => {
+          if (res.cancel) {
+            this.setData({
+              showDialog: true
+            })
+          }
+          if (res.confirm) {
+            this.setData({
+              submitStatus: true,
+              showDialog: false
+            });
+            wx.navigateBack();
+          }
+        },
+      });
+    }
   },
   onChangeSlider(e) {
     this.setData({
@@ -269,9 +285,21 @@
   },
   //璁剧疆鑳屾櫙鑹�
   changeBGColor(e) {
+    const flag = e.detail.value
     this.setData({
-      isNight: e.detail.value,
+      isNight: flag,
     });
+    if (flag) {
+      wx.setNavigationBarColor({
+        backgroundColor: '#000000',
+        frontColor: '#ffffff',
+      })
+    } else {
+      wx.setNavigationBarColor({
+        backgroundColor: '#ffffff',
+        frontColor: '#000000',
+      })
+    }
   },
   // 鑾峰彇淇濆瓨鐨勫�掕鏃舵椂闂�
   getSavedTime() {
@@ -329,11 +357,13 @@
   },
   // 鍒囨崲棰樼洰
   changeSwiper(e) {
-    this.setData({
-      currentIndex: e.detail.index,
-    });
     let index = e.detail.index - 1 >= 0 ? e.detail.index - 1 : 0;
     const item = this.data.questionDataList[index];
+    const lastItem = this.data.questionDataList[index + 1];
+    this.setData({
+      currentIndex: e.detail.index,
+      showId: lastItem.id
+    });
     if (
       (this.data.answerType == "collectQuestion" ||
         this.data.answerType == "errorQuestion") &&
@@ -496,7 +526,6 @@
   // 鎻愪氦閫昏緫
   submitPaper() {
     this.setData({
-      showDialog: false,
       submitStatus: true,
       loading: true,
     });
@@ -563,6 +592,7 @@
     }
     this.setData({
       loading: false,
+      showDialog: false,
     });
   },
   // 鍒濆鍖栧嚱鏁�
@@ -662,6 +692,7 @@
       subjectiveNum: 0,
       currentIndex: 0,
       submitStatus: false,
+      showDialog: true
     });
     if (this.data.answerType == "option") {
       this.setData({
@@ -1007,6 +1038,7 @@
     }
     this.setData({
       loading: false,
+      showId: this.data.questionDataList[0].id
     });
   },
   // 鎵规敼棰樼洰 锛堢粌涔狅紝鎴戠殑閿欓锛屾垜鐨勬敹钘�,锛岀粍鍗凤級
@@ -1198,7 +1230,6 @@
         }
       }
     }
-
     this.setAnswerInfo(setInfoData);
   },
   // 鎻愪氦绛旈鏁版嵁
@@ -1480,6 +1511,7 @@
     }
     this.setData({
       questionDataList: questionArr,
+      showId: questionArr[0].id,
       cardList: cardList,
       loading: false,
     });
@@ -1728,11 +1760,11 @@
       }
       this.setData({
         questionDataList: questionArr,
+        showId: questionArr[0].id,
         cardList: cardList,
         loading: false,
       });
     });
-    // loadings.value = false
   },
   // 鑾峰彇缁勫嵎缁撴灉
   async getEduQuizConfig() {
@@ -2011,6 +2043,7 @@
     }
     this.setData({
       loading: false,
+      showId: this.data.questionDataList[0].id
     });
   },
   // 鑾峰彇缁勫嵎鏁版嵁

--
Gitblit v1.9.1