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

zhongshujie

2024-12-20 32986b54a0e2661f7ad6ed79f3ef12c4289eace9

 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,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
@@ -90,6 +99,12 @@
        this.timeout();
      }
    },
    isShowDialog: function (newValue, oldValue) {
      if (newValue)
        this.setData({
          testReportState: newValue,
        });
    }
  },
  created() {},

@@ -188,11 +203,6 @@
        radioItem: e.detail.value,
      });
      const value = e.detail.value == "night" ? true : false;
      wx.setNavigationBarColor({
        backgroundColor: "#222",
        frontColor: "#222",
      });

      this.triggerEvent("changeBGColor", {
        value
      });
@@ -251,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) => {