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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.js b/packageBookService/pages/bookServices/examination/questionOptions/index.js
index 7c7ab59..dfaa84d 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.js
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -57,6 +57,9 @@
},
isShowDialog: {
type: Boolean
+ },
+ joinGroup:{
+ type:Boolean
}
},
@@ -75,7 +78,7 @@
},
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
@@ -258,7 +261,8 @@
// 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) => {
--
Gitblit v1.9.1