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

litian

2024-04-11 762a49929ee789aa81fd4df9c7c63be6749603c7

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

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

@@ -20,6 +20,7 @@
          </view>
        </t-radio>
      </view>
      <!-- 断开 -->
      <view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
        <t-radio value="mock" icon="none" borderless style="height: 80rpx">
          <view class="radio-content" slot="content">
@@ -32,6 +33,19 @@
          </view>
        </t-radio>
      </view>
      <!-- 断开 -->
      <!-- <view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
        <t-radio value="mock" icon="none" borderless style="height: 80rpx">
          <view class="radio-content" slot="content">
            <image
              src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
            ></image>
            <text style="color: {{radioItem == 'mock' ? '#fff':'#ff6c00'}};"
              >组卷</text
            >
          </view>
        </t-radio>
      </view> -->
    </t-radio-group>
    <t-button
      class="error-btn"

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

@@ -112,6 +112,12 @@
                    src="/static/images/bookService/detail/PPT.png"
                    mode="aspectFill"
                  />
                  <!-- 资源无文件内容图标 -->
                  <image
                    wx:else
                    src="/static/images/bookService/detail/word.png"
                    mode=""
                  />
                </view>
                <!-- 云学习图标 -->
                <view> </view>

 packageBookService/pages/bookServices/examination/examination.js

@@ -873,6 +873,14 @@
              '<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
            );
          }
          // 听力题修改
          if (questionObj.questionType == 'singleChoiceArr') {
            questionObj.stem.stemTxt = questionObj.stem.stemTxt
              .replace(
                /\<audio/gi,
                '<audio @play="play" '
              )
          }
          // 获取图片
          if (
            questionObj.stemStyle == "Image" ||

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

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

@@ -22,8 +22,8 @@
      wx:if="{{!submitStatus && (answerType == 'option' || answerType == 'mock')}}"
      style="color:  {{isNight ? '#fff' : '#000'}};"
    >
      <text>剩余时间 </text>
      <text class="parimary-color">{{showTime}}</text></view
      <view>剩余时间 </view>
      <view class="parimary-color remaining-time">{{showTime}}</view></view
    >
  </view>
  <!-- 进度条 -->

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

@@ -20,9 +20,14 @@
}

.remainder {
  display: flex;
  color: #545C63;
}

.remaining-time {
  margin-left: 6rpx;
}

.parimary-color {
  color: #ff6c00;
}

 pages/bookServices/assort/index.skeleton.wxml

@@ -18,18 +18,33 @@
<template name="skeleton">
  <view class="sk-container">
    <page-meta style="width: 100vw; overflow: hidden">
      <view style="width: 100%; height: 47px; "></view>
      <view class="nacigationBar" style="width: 100%; height: 40px;">
        <view class="navbar-title sk-transparent sk-text-14-2857-436 sk-text" style="background-position-x: 50%;">图书服务</view>
      <view style="width: 100%; height: 47px"></view>
      <view class="nacigationBar" style="width: 100%; height: 40px">
        <view
          class="navbar-title sk-transparent sk-text-14-2857-436 sk-text"
          style="background-position-x: 50%"
          >图书服务</view
        >
      </view>
      <view class="page-header">
        <view class="search">
          <view class=" t-search search--t-search " style="true">
            <view class="t-search__input-box search--t-search__input-box t-not-focused search--t-not-focused t-search__input-box-- search--t-search__input-box-- t-search__input-box--square search--t-search__input-box--square t-search__input-container">
              <view class="wr icon--wr  " style="color: #bbb; font-size: 20px;">
                <label class="wr-search icon--wr-search t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
            <view
              class="t-search__input-box search--t-search__input-box t-not-focused search--t-not-focused t-search__input-box-- search--t-search__input-box-- t-search__input-box--square search--t-search__input-box--square t-search__input-container"
            >
              <view class="wr icon--wr" style="color: #bbb; font-size: 20px">
                <label
                  class="wr-search icon--wr-search t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"
                ></label>
              </view>
              <view class="t-input__keyword search--t-input__keyword t-search__input sk-image" name="input" placeholder="请输入关键词/书名/ISBN/作者" placeholder-class="t-search__placeholder t-search__placeholder--normal" type="text" value="true"></view>
              <view
                class="t-input__keyword search--t-input__keyword t-search__input sk-image"
                name="input"
                placeholder="请输入关键词/书名/ISBN/作者"
                placeholder-class="t-search__placeholder t-search__placeholder--normal"
                type="text"
                value="true"
              ></view>
            </view>
          </view>
        </view>
@@ -38,17 +53,53 @@
        <view class="side-bar-wrapper">
          <view class="tab-left">
            <view class="t-side-bar bar--t-side-bar  " style="true">
              <view class="t-side-bar-item item--t-side-bar-item t-side-bar-item--active item--t-side-bar-item--active sk-transparent sk-button" style="true">
                <view class="t-side-bar-item__line item--t-side-bar-item__line"></view>
                <view class="t-side-bar-item__prefix item--t-side-bar-item__prefix sk-pseudo sk-pseudo-circle"></view>
                <view class="t-side-bar-item__suffix item--t-side-bar-item__suffix sk-pseudo sk-pseudo-circle"></view>高等教育</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">职业教育</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">教师教育</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">少儿教育</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">考试培训</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">主题出版</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">学术著作</view>
              <view class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button" style="true">大众读物</view>
              <view
                class="t-side-bar-item item--t-side-bar-item t-side-bar-item--active item--t-side-bar-item--active sk-transparent sk-button"
                style="true"
              >
                <view
                  class="t-side-bar-item__prefix item--t-side-bar-item__prefix sk-pseudo sk-pseudo-circle"
                ></view>
                <view
                  class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                ></view
                >高等教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >职业教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >教师教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >少儿教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >考试培训</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >主题出版</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >学术著作</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >大众读物</view
              >
              <view class="t-side-bar__padding bar--t-side-bar__padding"></view>
            </view>
          </view>
@@ -56,69 +107,155 @@
            <view class="side-bar-content">
              <view class="tab-top">
                <view class="myScroll">
                  <view class="row tab-active sk-transparent sk-text-14-2857-470 sk-text" data-tabdata="[object Object]">公共基础类</view>
                  <view class="row sk-transparent sk-text-14-2857-274 sk-text" data-tabdata="[object Object]">哲学</view>
                  <view class="row sk-transparent sk-text-14-2857-868 sk-text" data-tabdata="[object Object]">法学</view>
                  <view class="row sk-transparent sk-text-14-2857-149 sk-text" data-tabdata="[object Object]">经济学</view>
                  <view class="row sk-transparent sk-text-14-2857-66 sk-text" data-tabdata="[object Object]">管理学</view>
                  <view
                    class="row sk-transparent sk-text-14-2857-470 sk-text"
                    data-tabdata="[object Object]"
                    >公共基础类</view
                  >
                  <view
                    class="row sk-transparent sk-text-14-2857-274 sk-text"
                    data-tabdata="[object Object]"
                    >哲学</view
                  >
                  <view
                    class="row sk-transparent sk-text-14-2857-868 sk-text"
                    data-tabdata="[object Object]"
                    >法学</view
                  >
                  <view
                    class="row sk-transparent sk-text-14-2857-149 sk-text"
                    data-tabdata="[object Object]"
                    >经济学</view
                  >
                  <view
                    class="row sk-transparent sk-text-14-2857-66 sk-text"
                    data-tabdata="[object Object]"
                    >管理学</view
                  >
                </view>
              </view>
              <scroll-view class="class-list" scroll-into-view="list405" scroll-y="true">
              <scroll-view
                class="class-list"
                scroll-into-view="list405"
                scroll-y="true"
              >
                <view class="class-box" id="list405">
                  <view class="class-name sk-transparent sk-text-14-2857-360 sk-text">公共基础类</view>
                  <view
                    class="class-name sk-transparent sk-text-14-2857-360 sk-text"
                    >公共基础类</view
                  >
                  <view class="class-content">
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-787 sk-text">大学语文类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-787 sk-text"
                        >大学语文类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-115 sk-text">高等数学类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-115 sk-text"
                        >高等数学类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-469 sk-text">就业、创新与创业类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-469 sk-text"
                        >就业、创新与创业类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-515 sk-text">应用文写作类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-515 sk-text"
                        >应用文写作类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-824 sk-text">心理健康教育类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-824 sk-text"
                        >心理健康教育类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-988 sk-text">体育类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-988 sk-text"
                        >体育类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-89 sk-text">生涯规划类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-89 sk-text"
                        >生涯规划类</view
                      >
                    </view>
                    <view class="book-box" data-stair="[object Object]" data-tabdata="[object Object]">
                    <view
                      class="book-box"
                      data-stair="[object Object]"
                      data-tabdata="[object Object]"
                    >
                      <view class="assort-img">
                        <image mode="aspectFit" class="sk-image"></image>
                      </view>
                      <view class="classify sk-transparent sk-text-14-2857-188 sk-text">其他类</view>
                      <view
                        class="classify sk-transparent sk-text-14-2857-188 sk-text"
                        >其他类</view
                      >
                    </view>
                  </view>
                </view>
                <view class="class-box" id="list406">
                  <view class="class-name sk-transparent sk-text-14-2857-674 sk-text">哲学</view>
                  <view
                    class="class-name sk-transparent sk-text-14-2857-674 sk-text"
                    >哲学</view
                  >
                </view>
              </scroll-view>
            </view>

 static/images/bookService/examination/chongzuo-w.png

 static/images/bookService/examination/datika-w.png

 static/images/bookService/examination/setting-w.png

 static/images/bookService/examination/wodeshoucang-w.png