闫增涛
2024-12-16 4eaafc69d96ad39662e02314f0ea61b53c3b9659
教学互动答题完善
7个文件已修改
78 ■■■■ 已修改文件
packageBookService/pages/bookServices/detail/components/testResource/testResource.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/components/joinGroupDialog/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/examination.js 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionList/index.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionOptions/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/scanResult/index.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/testResource/testResource.js
@@ -138,7 +138,7 @@
            this.properties.bookInfo.rootCmsItemId
          }&idPathList=${JSON.stringify(idPathList)}&answerTitle=${
            value.name
          }&answerType=${"option"}&storeInfo=${this.properties.storeInfo}&jslx=${this.properties.jslx}`,
          }&answerType=${value.refCode ?? "option"}&storeInfo=${this.properties.storeInfo}&jslx=${this.properties.jslx}`,
        });
      }
    },
packageBookService/pages/bookServices/detail/index.js
@@ -1173,8 +1173,8 @@
                jslx: false,
              });
            } else {
              data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder' &&
                item.refCode != 'jsek_interaction')
              data = res.datas.cmsDatas[0].datas.filter((item) => item.type == 'questionBankFolder')
              // && item.refCode != 'jsek_interaction'
              that.setData({
                jslx: true,
              });
packageBookService/pages/bookServices/examination/components/joinGroupDialog/index.js
@@ -86,7 +86,7 @@
      } else {
        wx.showToast({
          icon: 'error',
          title: '请选择加入班级',
          title: '请选择后确认',
        })
      }
    },
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,18 +2293,41 @@
          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
      //   })
      // }
    })
  },
  // 加入班级
@@ -2358,9 +2382,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 +2411,11 @@
        }))
      })
    })
    list.push({
      name: "客观题得分",
      score: this.data.subjectiveNum,
      path: this.data.productLinkPath,
    })
    console.log('提交数据', list);
    app.MG.identity
      .setUserKey({
@@ -2402,20 +2433,28 @@
  },
  // 处理教学互动答题 
  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.setData({
          isShowDialog: true
        })
        this.setinteractionInfo(false)
      }
    }
    this.setData({
      submitStatus: true
packageBookService/pages/bookServices/examination/questionList/index.js
@@ -37,8 +37,10 @@
  observers: {},
  detached() {
    if (innerAudioContext) {
      innerAudioContext.stop();
      innerAudioContext.destroy();
      try {
        innerAudioContext.stop();
        innerAudioContext.destroy();
      } catch (error) {}
    }
  },
packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -75,7 +75,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
pages/scanResult/index.js
@@ -33,14 +33,12 @@
        // this.getRules();
        this.getProductByCode();
      } else {
        debugger
        this.setData({
          isOther: true
        })
      }
    } catch (error) {
      console.log(error);
      debugger
      this.setData({
        isOther: true
      })
@@ -165,7 +163,6 @@
            const list = JSON.parse(res.config);
            console.log('code', res, list);
            if (this.data.result) {
              const type = res.saleMethodList[0].type
              this.setData({
                goodsData: res,