Merge refs/remotes/origin/master into refs/heads/master

zhongshujie

2024-12-20 32986b54a0e2661f7ad6ed79f3ef12c4289eace9

 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) => {