From 32986b54a0e2661f7ad6ed79f3ef12c4289eace9 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 20 十二月 2024 17:52:52 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/examination/questionOptions/index.js | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.js b/packageBookService/pages/bookServices/examination/questionOptions/index.js
index 40919c9..dfaa84d 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.js
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -52,6 +52,15 @@
type: Boolean,
value: false,
},
+ showId: {
+ type: String
+ },
+ isShowDialog: {
+ type: Boolean
+ },
+ joinGroup:{
+ type:Boolean
+ }
},
/**
@@ -69,13 +78,13 @@
},
observers: {
countdownTime: function (newValue, oldValue) {
- if (this.properties.answerType == "option") {
+ if (this.properties.answerType == "option" || this.properties.answerType == 'interaction') {
this.setData({
useTime: this.formatTime(
2 * 60 * 60 * 1000 - this.properties.countdownTime
),
});
- } else if (this.properties.answerType == "option") {
+ } else if (this.properties.answerType == "mock") {
this.setData({
useTime: this.formatTime(
this.properties.mockSumTime - this.properties.countdownTime
@@ -85,11 +94,17 @@
if (
newValue == 0 &&
(this.properties.answerType == "option" ||
- this.properties.answerType == "mock")
+ this.properties.answerType == "mock") && !this.properties.submitStatus
) {
this.timeout();
}
},
+ isShowDialog: function (newValue, oldValue) {
+ if (newValue)
+ this.setData({
+ testReportState: newValue,
+ });
+ }
},
created() {},
@@ -172,7 +187,9 @@
onChangeSlider(e) {
const value = e.detail.value;
console.log(value);
- this.triggerEvent("onChangeSlider", { value });
+ this.triggerEvent("onChangeSlider", {
+ value
+ });
},
// 璁剧疆閬僵灞傜偣鍑�
onSetUpChange(e) {
@@ -186,12 +203,9 @@
radioItem: e.detail.value,
});
const value = e.detail.value == "night" ? true : false;
- wx.setNavigationBarColor({
- backgroundColor: "#222",
- frontColor: "#222",
+ this.triggerEvent("changeBGColor", {
+ value
});
-
- this.triggerEvent("changeBGColor", { value });
},
// 閲嶅仛鎸夐挳
resterBtn() {
@@ -244,10 +258,11 @@
this.properties.answerType == "errorQuestion"
) {
this.submitPaper();
- return wx.navigateBack();
+ // wx.navigateBack();
} else if (
this.properties.answerType == "option" ||
- this.properties.answerType == "mock"
+ this.properties.answerType == "mock" ||
+ this.properties.answerType == "interaction"
) {
if (this.properties.submitStatus) return wx.navigateBack();
this.properties.questionDataList.forEach((item) => {
@@ -305,4 +320,4 @@
this.submitPaper();
},
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1