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

zhongshujie

2024-12-18 5dcba93841a0dadb81a74b55062e440af20ad9d3

 packageBookService/pages/bookServices/examination/examination.js

@@ -2285,6 +2285,7 @@
      filterList: [],
    }
    app.MG.identity.joinedGroupByList(query).then((res) => {
      console.log('班级信息', res);
      res.datas.forEach(async item => {
        item.topicId = null
        const data = await this.getTopicInfo(item.id)
@@ -2292,26 +2293,53 @@
          item.topicId = data.id
        }
      })

      if (res.datas.length) {
        this.setData({
          joinGroup: true,
          classList: res.datas,
          classList: res.datas
        })
        // 判断班级 是否所属于该书
        const flag = res.datas.some(item => item.linkProductDto.product.id == this.data.bookId)
        if (!flag) {
          this.setData({
            visible: true,
          })
        } else {
          this.setData({
            visible: false,
            joinGroup: true
          })
        }
      } else {
        // 未加入班级，唤起加入班级弹窗
        this.setData({
          joinGroup: false,
          visible: true
          visible: true,
        })
      }

      // if (res.datas.length) {
      //   this.setData({
      //     classList: res.datas,
      //     visible: true
      //   })
      // } else {
      //   // 未加入班级，唤起加入班级弹窗
      //   this.setData({
      //     joinGroup: false,
      //     visible: true
      //   })
      // }
    })
  },
  // 加入班级
  joinClass(e) {
    wx.showLoading({
      title: '加载中'
    })
    const data = {
      refCode: e.detail.value
    }
    app.MG.identity.joinGroupByRefCode(data).then((res) => {
      wx.hideLoading()
      if (res == '组不存在') {
        wx.showToast({
          icon: 'error',
@@ -2358,9 +2386,11 @@
      .then((res) => {
        if (res.length) {
          let value = JSON.parse(res[0].value);
          const scoreData = value.dataList.find(item => item.name == "客观题得分" && item.path == this.data.productLinkPath)
          this.setData({
            submitStatus: value.submitStatus,
            currentIndex: value.currentIndex,
            subjectiveNum: scoreData ? scoreData.score : 0
          });
          // 携带答题记录 获取题目
          this.getQuestionList(value.dataList);
@@ -2385,6 +2415,11 @@
        }))
      })
    })
    list.push({
      name: "客观题得分",
      score: this.data.subjectiveNum,
      path: this.data.productLinkPath,
    })
    console.log('提交数据', list);
    app.MG.identity
      .setUserKey({
@@ -2402,20 +2437,27 @@
  },
  // 处理教学互动答题 
  handleClassQuestion() {
    debugger
    console.log(1, this.data.questionDataList);
    const flag = this.data.questionDataList.some(item => !item.userAnswer)
    if (flag) {
      // 没做完，保存即可
      const isAnswer = this.data.questionDataList.some(item => item.userAnswer)
      if (isAnswer) this.setinteractionInfo(false)
    } else {
      // 做完了，提交到message
      this.setinteractionInfo(true)
      if (this.data.classList.length) {
      // 做完了且加入了班级，提交到message
      if (this.data.classList.length && this.data.joinGroup) {
        this.data.classList.forEach(item => {
          this.newTopicMessage(item.topicId)
          if (item.linkProductDto.product.id == this.data.bookId)
            this.newTopicMessage(item.topicId)
        })
        this.setinteractionInfo(true)
      } else {
        // 做完了，没加入班级
        this.setinteractionInfo(false)
      }
      this.setData({
        isShowDialog: true
      })
    }
    this.setData({
      submitStatus: true