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/bookServices/examination/questionOptions/index.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.js b/packageBookService/pages/bookServices/examination/questionOptions/index.js
index 47cb7cf..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

--
Gitblit v1.9.1