packageBookService/pages/bookServices/detail/components/testResource/testResource.js

@@ -84,7 +84,7 @@
      }
      if (!this.data.isBuyBank) return wx.showToast({
        icon: 'error',
        title: '请先购买题库',
        title: '请先激活或购买题库',
      })
      wx.showLoading({
        title: "加载中",

 packageBookService/pages/bookServices/detail/components/tree/index.js

@@ -231,19 +231,19 @@
          // // 有父级(包含销售方式)，且未购买
          if (!item.isbuy && !item.freeFile) return wx.showToast({
            icon: 'error',
            title: '请先购买该资源',
            title: '请先激活或购买资源',
          })
          if (item.protectedFile || item.freeFile) {
            let file = item.fileMap[item.protectedFile] ? item.fileMap[item.protectedFile] : item.fileMap[item.freeFile]
            if (file && file.protectType !== "Public") {
              if (!item.isbuy) {
                return wx.showToast({
                  icon: 'error',
                  title: '请先购买该资源',
                });
              }
            }
          }
          // if (!item.isbuy && item.freeFile) {
          //   let file = item.fileMap[item.freeFile]
          //   if (file && file.protectType !== "Public") {
          //     if (!item.isbuy) {
          //       return wx.showToast({
          //         icon: 'error',
          //         title: '请先购买该资源',
          //       });
          //     }
          //   }
          // }
        }
        let url;
        if (item.selectType == "video" || item.learnSelectType == "video") {

 packageBookService/pages/bookServices/detail/components/tree/index.wxml

@@ -39,11 +39,11 @@
            </view>
            <view wx:if="{{tab == 'jsek_cloudLearning'}}">
              <!-- 云学习试看图标 -->
              <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}"></image>
              <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!item.isbuy  && item.freeFile&& item.isShowIcon}}"></image>
              <!-- 云学习加入购物车图标 -->
              <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{item.isShopCar && !bookInfo.IsTextbook}}" class="shopCar" data-item="{{item}}" catch:tap="onCloudShoppingCart"></image>
              <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{item.isShopCar && !bookInfo.IsTextbook && item.isShowIcon}}" class="shopCar" data-item="{{item}}" catch:tap="onCloudShoppingCart"></image>
              <!-- 云学习购买图标 -->
              <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{item.isbuy && !bookInfo.IsTextbook }}"></image>
              <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{!item.isbuy && !bookInfo.IsTextbook && item.isShowIcon }}"></image>
            </view>
          </view>
        </view>

 packageBookService/pages/bookServices/detail/index.js

@@ -1006,7 +1006,7 @@
          // 查找目录下资源销售方式，目录下资源没有销售方式
          if (item.saleMethod?.length == 0) {
            // 查看其父级是否有销售方式
            if (parent.saleMethod?.length > 0) {
            if (parent?.saleMethod?.length > 0) {
              // 父级是有销售方式直接显示按钮
              parent.isShowIcon = true
            }
@@ -1163,6 +1163,7 @@
          openLearnids: result,
          learnPath: type.productLinkPath
        });
        debugger
      }
    })
  },

 packageBookService/pages/bookServices/examination/components/joinGroupDialog/index.js

@@ -9,6 +9,10 @@
  },
  ready() {
    var that = this;
    const isJoinClass = wx.getStorageSync('joinClass')
    that.setData({
      noTip: isJoinClass
    })
    // 动态获取屏幕高度
    wx.getSystemInfo({
      success: (result) => {
@@ -47,6 +51,14 @@
      })
    },

    // 不再提示加入班级
    onChangeshow(e) {
      wx.setStorageSync('joinClass', e.detail.checked)
      this.setData({
        noTip: e.detail.checked
      })
    },

    // 输入框改变
    inputChange(e) {
      this.setData({

 packageBookService/pages/bookServices/examination/components/joinGroupDialog/index.wxml

@@ -11,7 +11,7 @@
        <input value="{{inputvalue}}" placeholder="请输入班级邀请码" bind:change="inputChange" type="text" class="phone" style="{{inputStyle}}" />
      </view>
      <t-radio allow-uncheck icon="dot" label="不加入班级" value="0" data-value="2" checked="{{joinGroup == 2}}" bind:change="onChangeRadio" />
      <t-checkbox label="不再提示加入班级" icon="rectangle" value="{{noTip}}" />
      <t-checkbox label="不再提示加入班级" icon="rectangle" checked="{{noTip}}" bind:change="onChangeshow" />
    </view>
    <view class="submit-btn">
      <t-button theme="primary" size="large" block bind:tap="confirmSuggest">确认</t-button>

 packageBookService/pages/bookServices/examination/examination.js

@@ -992,18 +992,37 @@
          }
          // 填空题改造
          if (questionObj.questionType == "completion") {
            let c = [];
            let index = 0;
            for (let i = 0; i < questionObj.stem.length; i++) {
              const item = questionObj.stem[i];
              if (item == "input") {
                questionObj.stem[i] = {
                  num: index,
                  data: "input",
                };
              if (item != 'input') {
                item.split("").map(citem => {
                  const obj = {
                    type: 'txt',
                    text: citem
                  }
                  c.push(obj)
                })
              } else {
                const obj = {
                  type: "input",
                  num: index
                }
                if (!oldObj) questionObj.userAnswer[index] = "";
                index++;
                c.push(obj)
              }
              // if (item == "input") {
              //   questionObj.stem[i] = {
              //     num: index,
              //     data: "input",
              //   };
              //   if (!oldObj) questionObj.userAnswer[index] = "";
              //   index++;
              // }
            }
            questionObj.customArr = c;
          }
          // 题干富文本处理
          if (questionObj.stemStyle == "RichText") {
@@ -2330,7 +2349,7 @@
          item.topicId = data.id
        }
      })
      console.log('班级', res)
      let isJoinClass = wx.getStorageSync('joinClass')
      if (res.datas.length) {
        this.setData({
          classList: res.datas
@@ -2363,20 +2382,28 @@
            })
          } else {
            // 拒绝
            if (!isJoinClass) {

              this.setData({
                visible: true
              })
            }

          }
        } else {
          // 未加入班级
          if (!isJoinClass) {
            this.setData({
              visible: true
            })
          }
        } else {
          // 未加入班级
        }
      } else {
        if (!isJoinClass) {
          this.setData({
            visible: true
          })
        }
      } else {
        this.setData({
          visible: true,
        })
      }

    })

 packageBookService/pages/bookServices/examination/questionList/index.wxml

@@ -35,10 +35,10 @@
          <mp-html content="{{item.stem.stemTxt}}" />
        </view>
        <!-- 填空题 -->
        <view wx:if="{{item.questionType == 'completion'}}">
          <view class="completion-box" wx:for="{{item.stem}}" wx:for-item="inputItem" wx:for-index="inputIndex" wx:key="inputIndex">
            <t-input disabled="{{item.isComplete}}" borderless bind:change="onChangeInput" data-value="{{item.option}}" data-id="{{item.id}}" data-index="{{inputItem.num}}" class="title-input {{isNight ? 'input-night-color' : ''}}" style="border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;background-color:{{isNight ? '#000' : '#fff'}}; " placeholder-style="{{placeholderstyle}}" wx:if="{{inputItem.data == 'input'}}" placeholder="请输入文字" value="{{item.userAnswer[inputItem.num]}}"></t-input>
            <text wx:else class="text-space">{{inputItem}}</text>
        <view wx:if="{{item.questionType == 'completion'}}" class="completion-parent">
          <view class="completion-box" wx:for="{{item.customArr}}" wx:for-item="inputItem" wx:for-index="inputIndex" wx:key="inputIndex">
            <t-input disabled="{{item.isComplete}}" borderless bind:change="onChangeInput" data-value="{{item.option}}" data-id="{{item.id}}" data-index="{{inputItem.num}}" class="title-input {{isNight ? 'input-night-color' : ''}}" style="border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;background-color:{{isNight ? '#000' : '#fff'}}; " placeholder-style="{{placeholderstyle}}" wx:if="{{inputItem.type == 'input'}}" placeholder="请输入文字" value="{{item.userAnswer[inputItem.num]}}"></t-input>
            <text wx:else class="text-space">{{inputItem.text}}</text>
          </view>
        </view>
      </view>

 packageBookService/pages/bookServices/examination/questionList/index.wxss

@@ -113,8 +113,13 @@
  align-items: center;
} */

.completion-parent {
  display: flex;
  flex-wrap: wrap;
}

.completion-box {
  display: inline-block;
  flex-direction: row;
  margin-bottom: 15rpx;
}

@@ -124,6 +129,7 @@

.title-input {
  /* display: inline-block; */
  max-width: 200rpx;
  height: 40rpx;
  --td-input-vertical-padding: 16rpx
}

 packageBookService/pages/bookServices/examination/questionOptions/index.js

@@ -258,11 +258,7 @@
      ) {
        this.submitPaper();
        // wx.navigateBack();
      } else if (
        this.properties.answerType == "option" ||
        this.properties.answerType == "mock" ||
        this.properties.answerType == "interaction"
      ) {
      } else if (this.properties.answerType == "option" || this.properties.answerType == "mock" || this.properties.answerType == "interaction") {
        if (this.properties.submitStatus) return wx.navigateBack();
        this.properties.questionDataList.forEach((item) => {
          if (!this.isHaveAnswer(item.userAnswer)) {

 packageBookService/pages/bookServices/examination/questionOptions/index.wxml

@@ -1,105 +1,48 @@
<!--pages/bookServices/examination/questionOptions/index.wxml-->
<view
  class="page-bottom"
  style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#202020' : '#fff'}}"
>
  <view
    class="li-option"
    bind:tap="setCollect"
    style="color: {{isNight ? '#fff' : '#000'}};"
    wx:if="{{answerType !== 'interaction'}}"
  >
    <image
      src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : isNight ? '/static/images/bookService/examination/wodeshoucang-w.png' : '/static/images/bookService/examination/collect.png'}}"
    />
<view class="page-bottom" style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#202020' : '#fff'}}">
  <view class="li-option" bind:tap="setCollect" style="color: {{isNight ? '#fff' : '#000'}};" wx:if="{{answerType !== 'interaction'}}">
    <image src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : isNight ? '/static/images/bookService/examination/wodeshoucang-w.png' : '/static/images/bookService/examination/collect.png'}}" />
    收藏
  </view>
  <view
    class="li-option"
    bind:tap="handlePopup"
    style="color: {{isNight ? '#fff' : '#000'}};"
  >
    <image
      src="{{isNight ? '/static/images/bookService/examination/datika-w.png' : '/static/images/bookService/examination/questionCard.png'}}"
    />
  <view class="li-option" bind:tap="handlePopup" style="color: {{isNight ? '#fff' : '#000'}};">
    <image src="{{isNight ? '/static/images/bookService/examination/datika-w.png' : '/static/images/bookService/examination/questionCard.png'}}" />
    答题卡
  </view>
  <view
    class="li-option"
    bind:tap="setUpBtn"
    style="color: {{isNight ? '#fff' : '#000'}};"
  >
    <image
      src="{{isNight ? '/static/images/bookService/examination/setting-w.png' : '/static/images/bookService/examination/setting.png'}}"
    />
  <view class="li-option" bind:tap="setUpBtn" style="color: {{isNight ? '#fff' : '#000'}};">
    <image src="{{isNight ? '/static/images/bookService/examination/setting-w.png' : '/static/images/bookService/examination/setting.png'}}" />
    设置
  </view>
  <view
    class="li-option"
    bind:tap="resterBtn"
    wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus) || (answerType == 'interaction' && !joinGroup)}}"
    style="color: {{isNight ? '#fff' : '#000'}};"
  >
    <image
      src="{{isNight ? '/static/images/bookService/examination/chongzuo-w.png' : '/static/images/bookService/examination/reset.png'}}"
    />
  <view class="li-option" bind:tap="resterBtn" wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus) || (answerType == 'interaction' && !joinGroup)}}" style="color: {{isNight ? '#fff' : '#000'}};">
    <image src="{{isNight ? '/static/images/bookService/examination/chongzuo-w.png' : '/static/images/bookService/examination/reset.png'}}" />
    重做
  </view>
  <view class="bottom-submit">
    <t-button
      theme="primary"
      size="large"
      style="{{btnStyle}}"
      bind:tap="submitBtn"
      >{{(answerType == 'option' || answerType == 'mock' || answerType ==
      'interaction') && !submitStatus ? '提交' : '退出'}}</t-button
    >
    <t-button theme="primary" size="large" style="{{btnStyle}}" bind:tap="submitBtn">{{(answerType == 'option' || answerType == 'mock' || answerType ==
      'interaction') && !submitStatus ? '提交' : '退出'}}</t-button>
  </view>
</view>

<!-- 答题卡 -->
<t-popup
  visible="{{questionCardState}}"
  bind:visible-change="onVisibleChange"
  placement="bottom"
>
<t-popup visible="{{questionCardState}}" bind:visible-change="onVisibleChange" placement="bottom">
  <view class="popup-block">
    <view class="popup-header">
      <view class="popup-title">答题卡</view>
    </view>
    <view class="question-explain">
      <view
        class="explain-answered"
        wx:if="{{answerType == 'collectQuestion' || answerType == 'errorQuestion' || (answerType == 'option' && !submitStatus) || (answerType == 'mock' && !submitStatus)}}"
      >
      <view class="explain-answered" wx:if="{{answerType == 'collectQuestion' || answerType == 'errorQuestion' || (answerType == 'option' && !submitStatus) || (answerType == 'mock' && !submitStatus)}}">
        <text class="answered explain-color-box"></text>
        <text>已答</text>
      </view>
      <view
        class="explain-un-answered"
        wx:if="{{answerType == 'collectQuestion' || answerType == 'errorQuestion' || (answerType == 'option' && !submitStatus) || (answerType == 'mock' && !submitStatus)}}"
      >
      <view class="explain-un-answered" wx:if="{{answerType == 'collectQuestion' || answerType == 'errorQuestion' || (answerType == 'option' && !submitStatus) || (answerType == 'mock' && !submitStatus)}}">
        <text class="un-answered explain-color-box"></text>
        <text>未答</text>
      </view>
      <view
        class="error-box"
        wx:if="{{((answerType == 'option' || answerType == 'mock') && submitStatus) || answerType == 'collectQuestion' || answerType == 'errorQuestion'}}"
      >
        <text
          class="explain-color-box"
          style="background-color: #ee1818"
        ></text>
      <view class="error-box" wx:if="{{((answerType == 'option' || answerType == 'mock') && submitStatus) || answerType == 'collectQuestion' || answerType == 'errorQuestion'}}">
        <text class="explain-color-box" style="background-color: #ee1818"></text>
        <text>错误</text>
      </view>
      <view
        class="correct-box"
        wx:if="{{((answerType == 'option' || answerType == 'mock') && submitStatus) || answerType == 'collectQuestion' || answerType == 'errorQuestion'}}"
      >
        <text
          class="explain-color-box"
          style="background-color: #1fbc1f"
        ></text>
      <view class="correct-box" wx:if="{{((answerType == 'option' || answerType == 'mock') && submitStatus) || answerType == 'collectQuestion' || answerType == 'errorQuestion'}}">
        <text class="explain-color-box" style="background-color: #1fbc1f"></text>
        <text>正确</text>
      </view>
    </view>
@@ -111,16 +54,7 @@
          <text class="title-text">{{item.catalogName}}</text>
        </view>
        <view class="question-list">
          <view
            bind:tap="goQuestion"
            data-id="{{citem.id}}"
            wx:for="{{item.infoList}}"
            wx:for-item="citem"
            wx:for-index="cindex"
            wx:key="cindex"
            style="border: {{showId == citem.id ? '1px solid #ff6c00' : ''}}"
            class="question-box {{ citem.isUserAnswer ? 'answered' : 'un-answered' }} {{ ( ((answerType == 'option' || answerType == 'mock') && submitStatus || answerType == 'collectQuestion' || answerType == 'errorQuestion')  && citem.questionType !== 'shortAnswer' )  ? citem.isRight && citem.isComplete ? 'correct-box-color' : citem.isComplete && !citem.isRight ?  'error-box-color' : '' :''}} "
          >
          <view bind:tap="goQuestion" data-id="{{citem.id}}" wx:for="{{item.infoList}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex" style="border: {{showId == citem.id ? '1px solid #ff6c00' : ''}}" class="question-box {{ citem.isUserAnswer ? 'answered' : 'un-answered' }} {{ ( ((answerType == 'option' || answerType == 'mock') && submitStatus || answerType == 'collectQuestion' || answerType == 'errorQuestion')  && citem.questionType !== 'shortAnswer' )  ? citem.isRight && citem.isComplete ? 'correct-box-color' : citem.isComplete && !citem.isRight ?  'error-box-color' : '' :''}} ">
            {{citem.number}}
          </view>
        </view>
@@ -130,11 +64,7 @@
</t-popup>

<!-- 设置 -->
<t-popup
  visible="{{setUpPopup}}"
  bind:visible-change="onSetUpChange"
  placement="bottom"
>
<t-popup visible="{{setUpPopup}}" bind:visible-change="onSetUpChange" placement="bottom">
  <view class="popup-block set-up-popup">
    <view class="popup-header">
      <view class="popup-title">设置</view>
@@ -151,48 +81,27 @@
          step="{{7}}"
          bind:change="onChangeSlider"
        /> -->
        <slider
          value="{{sliderValue}}"
          min="{{28}}"
          max="{{48}}"
          step="{{7}}"
          activeColor="#ff6c00"
          bind:change="onChangeSlider"
        />
        <slider value="{{sliderValue}}" min="{{28}}" max="{{48}}" step="{{7}}" activeColor="#ff6c00" bind:change="onChangeSlider" />
      </view>

      <text>A+</text>
    </view>
    <!-- 模式 -->
    <view>
      <t-radio-group
        class="test-radio"
        t-class="horizontal-box"
        value="{{radioItem}}"
        bind:change="onRadioChange"
        style="margin: 0px"
      >
      <t-radio-group class="test-radio" t-class="horizontal-box" value="{{radioItem}}" bind:change="onRadioChange" style="margin: 0px">
        <view class="card {{radioItem == 'daytime' ? 'card--active' : ''}}">
          <t-radio value="daytime" icon="none" borderless style="height: 100%">
            <view class="radio-content" slot="content">
              <image
                src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian-click.png' : '/static/images/bookService/examination/rijian.png'}}"
              />
              <text style="color: {{radioItem == 'daytime' ? '#fff':''}};"
                >日间模式</text
              >
              <image src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian-click.png' : '/static/images/bookService/examination/rijian.png'}}" />
              <text style="color: {{radioItem == 'daytime' ? '#fff':''}};">日间模式</text>
            </view>
          </t-radio>
        </view>
        <view class="card {{radioItem == 'night' ? 'card--active' : ''}}">
          <t-radio value="night" icon="none" borderless style="height: 100%">
            <view class="radio-content" slot="content">
              <image
                src="{{ radioItem == 'night' ? '/static/images/bookService/examination/yejian-click.png' : '/static/images/bookService/examination/yejian.png'}}"
              />
              <text style="color: {{radioItem == 'night' ? '#fff':''}};"
                >夜间模式</text
              >
              <image src="{{ radioItem == 'night' ? '/static/images/bookService/examination/yejian-click.png' : '/static/images/bookService/examination/yejian.png'}}" />
              <text style="color: {{radioItem == 'night' ? '#fff':''}};">夜间模式</text>
            </view>
          </t-radio>
        </view>
@@ -203,13 +112,7 @@

<!-- 测试报告 -->

<t-dialog
  class="test-report"
  visible="{{testReportState}}"
  confirm-btn="{{null}}"
  title="测试报告"
  bind:close="closeTestReportDialog"
>
<t-dialog class="test-report" visible="{{testReportState}}" confirm-btn="{{null}}" title="测试报告" bind:close="closeTestReportDialog">
  <view slot="content" class="test-report">
    <view class="report-content-top">
      <view class="report-li">
@@ -222,34 +125,24 @@
      </view>
      <view class="report-li">
        <view class="report-li-left">其中客观题：</view>
        <view class="report-li-right"
          >{{subjectiveTotal}}道，分值{{subjectiveGrade}}分</view
        >
        <view class="report-li-right">{{subjectiveTotal}}道，分值{{subjectiveGrade}}分</view>
      </view>
      <view class="report-li">
        <view class="report-li-left">答对：</view>
        <view class="report-li-right"
          ><text class="correct-color">{{correctNum}}</text> 道</view
        >
        <view class="report-li-right"><text class="correct-color">{{correctNum}}</text> 道</view>
      </view>
      <view class="report-li">
        <view class="report-li-left">答错：</view>
        <view class="report-li-right"
          ><text class="error-color">{{subjectiveTotal - correctNum}}</text>
          道</view
        >
        <view class="report-li-right"><text class="error-color">{{subjectiveTotal - correctNum}}</text>
          道</view>
      </view>
      <view class="report-li">
        <view class="report-li-left">客观题得分：</view>
        <view class="report-li-right"
          ><text class="score-color">{{subjectiveNum}}</text> 分</view
        >
        <view class="report-li-right"><text class="score-color">{{subjectiveNum}}</text> 分</view>
      </view>
    </view>
    <view class="report-content-bottom">
      <t-button theme="primary" bind:tap="viewAnswer" style="width: 560rpx"
        >查看答案与解析</t-button
      >
      <t-button theme="primary" bind:tap="viewAnswer" style="width: 560rpx">查看答案与解析</t-button>
    </view>
  </view>
</t-dialog>
</t-dialog>

 packageDomain/pages/sampleBookList/index.js

@@ -154,7 +154,7 @@
    }
    that.getBookList(false)
  },

  
  /**
   * 生命周期函数--监听页面初次渲染完成
   */