闫增涛
2024-03-26 5ca38e4ef60e35f08e87d6569b72c25433c311ca
答题器bug修改,添加请求地址
6个文件已修改
648 ■■■■ 已修改文件
assets/js/config.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.wxml 639 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.wxss 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/examination.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/examination/questionOptions/index.wxml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
assets/js/config.js
@@ -1,6 +1,7 @@
export const requestCtx = "http://182.92.203.7:3001"; // 请求地址
// export const requestCtx = "http://182.92.203.7:3001"; // 请求地址
export const appId = 27;
// export const requestCtx = "http://jsysf.bnuic.com"; // 请求地址
export const requestCtx = "https://jsek.bnuic.com"  // 请求地址
// export const appId = 3;
export const requestTimeOut = 300000; // 请求超时时间
export const tokenKey = "jsek-token";
packageBookService/pages/bookServices/detail/index.js
@@ -907,7 +907,7 @@
      }
    })
    this.setData({
      applyResourceState: false
      applyResourceState: false,
    })
    wx.hideLoading()
  },
packageBookService/pages/bookServices/detail/index.wxml
@@ -2,342 +2,351 @@
<!--导航区域 -->
<view class="page-bookService">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
  <view>
    <t-icon
      name="chevron-left"
      size="30"
      data-name="{{item}}"
      bind:click="goBack"
    />
  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
    <view>
      <t-icon
        name="chevron-left"
        size="30"
        data-name="{{item}}"
        bind:click="goBack"
      />
    </view>
    <view class="navbar-title">{{options.name}}</view>
  </view>
  <view class="navbar-title">{{options.name}}</view>
</view>
<t-toast id="t-toast" />
<scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
  <!-- 图书详情 -->
  <view class="book-box">
    <view class="book-detail">
      <view class="detail-left">
        <view class="book-img">
  <t-toast id="t-toast" />
  <scroll-view
    scroll-y="{{true}}"
    class="book"
    bindscrolltolower="onReachBottom"
  >
    <!-- 图书详情 -->
    <view class="book-box">
      <view class="book-detail">
        <view class="detail-left">
          <view class="book-img">
            <image
              loading=""
              src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
              mode="aspectFill"
              aria-label="{{bookDetail.name}}"
            />
          </view>
          <view class="book-use">
            <view class="collect" bind:tap="setCollect">
              <view>
                <image
                  loading=""
                  src="/static/images/bookService/detail/collect.png"
                  wx:if="{{!bookDetail.isFavourite}}"
                />
                <image
                  loading=""
                  src="/static/images/bookService/detail/collecting.png"
                  wx:if="{{bookDetail.isFavourite}}"
                />
              </view>
              <view class="use-title">收藏</view>
            </view>
            <view class="suggest" bind:tap="suggestBtn">
              <view>
                <image
                  loading=""
                  src="/static/images/bookService/detail/suggest.png"
                />
              </view>
              <view class="use-title">我要建议</view>
            </view>
          </view>
        </view>
        <view class="detail-right">
          <view class="book-name">{{bookDetail.name}}</view>
          <view class="book-message">
            <view class="message-li" wx:if="{{bookDetail.seriesName}}">
              <view class="li-title">丛书名:</view>
              <view class="li-content">{{bookDetail.seriesName}}</view>
            </view>
            <view class="message-li">
              <view class="li-title" wx:if="{{bookDetail.author}}">作者:</view>
              <view class="li-content">{{bookDetail.author}}</view>
            </view>
            <view class="message-li" wx:if="{{bookDetail.isbn}}">
              <view class="li-title">ISBN:</view>
              <view class="li-content">{{bookDetail.isbn}}</view>
            </view>
            <view class="message-li">
              <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
                >出版时间:</view
              >
              <view class="li-content">{{bookDetail.publicationDate}}</view>
            </view>
            <view
              class="message-li"
              wx:if="{{bookDetail.class}}"
              style="height: 80rpx"
            >
              <view class="li-title">图书分类:</view>
              <view class="class-name showTow">{{bookDetail.class}}</view>
            </view>
          </view>
          <image
            loading=""
            src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
            mode="aspectFill"
            aria-label="{{bookDetail.name}}"
            src="/static/images/bookService/detail/square.png"
            class="right-background"
          />
        </view>
        <view class="book-use">
          <view class="collect" bind:tap="setCollect">
      </view>
      <!-- 销售信息 -->
      <view class="book-sale">
        <view class="book-price">
          <!-- 电子书售价 -->
          <view class="electron-price">
            <view>
              <image
                loading=""
                src="/static/images/bookService/detail/collect.png"
                wx:if="{{!bookDetail.isFavourite}}"
              />
              <image
                loading=""
                src="/static/images/bookService/detail/collecting.png"
                wx:if="{{bookDetail.isFavourite}}"
                src="/static/images/bookService/detail/electon-price.png"
              />
            </view>
            <view class="use-title">收藏</view>
            <view class="price">
              <view class="price-text"
                >{{bookDetail.price == '0.00' ? '免费' : '¥'+
                bookDetail.price}}</view
              >
              <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
                >¥{{bookDetail.oldPrice}}
              </view>
            </view>
            <view> </view>
          </view>
          <view class="suggest" bind:tap="suggestBtn">
          <!-- 纸质书售价 -->
          <view class="paper-price" wx:if="{{bookDetail.paperPrice}}">
            <view>
              <image
                loading=""
                src="/static/images/bookService/detail/suggest.png"
              />
              <image src="/static/images/bookService/detail/paper-price.png" />
            </view>
            <view class="use-title">我要建议</view>
            <view class="price"
              >{{bookDetail.paperPrice == '0.00' ? '免费' :
              '¥'+bookDetail.paperPrice}}</view
            >
          </view>
        </view>
        <!-- 网店 -->
        <view class="book-web">
          <image
            src="/static/images/bookService/detail/jd.png"
            wx:if="{{bookDetail.JDLink}}"
            bind:tap="goShop"
            data-link="{{bookDetail.JDLink}}"
            data-type="jd"
          />
          <image
            class="tmall-image"
            src="/static/images/bookService/detail/tmall.png"
            bind:tap="goShop"
            data-link="{{bookDetail.tmallLink}}"
            wx:if="{{bookDetail.tmallLink}}"
          />
          <image
            src="/static/images/bookService/detail/dangdang.png"
            bind:tap="goShop"
            data-link="{{bookDetail.dangdangLink}}"
            wx:if="{{bookDetail.dangdangLink}}"
          />
          <image
            src="/static/images/bookService/detail/weidian.png"
            bind:tap="goShop"
            data-link="{{bookDetail.weidianLink}}"
            wx:if="{{bookDetail.weidianLink}}"
          />
        </view>
      </view>
      <view class="detail-right">
        <view class="book-name">{{bookDetail.name}}</view>
        <view class="book-message">
          <view class="message-li" wx:if="{{bookDetail.seriesName}}">
            <view class="li-title">丛书名:</view>
            <view class="li-content">{{bookDetail.seriesName}}</view>
          </view>
          <view class="message-li">
            <view class="li-title" wx:if="{{bookDetail.author}}">作者:</view>
            <view class="li-content">{{bookDetail.author}}</view>
          </view>
          <view class="message-li" wx:if="{{bookDetail.isbn}}">
            <view class="li-title">ISBN:</view>
            <view class="li-content">{{bookDetail.isbn}}</view>
          </view>
          <view class="message-li">
            <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
              >出版时间:</view
            >
            <view class="li-content">{{bookDetail.publicationDate}}</view>
          </view>
    </view>
    <view class="book-resource">
      <t-tabs
        defaultValue="{{tabValue}}"
        bind:change="onTabsChange"
        t-class="custom-tabs"
        t-class-content="custom-panel"
        class="tab-class"
      >
        <t-tab-panel label="图书简介" value="brief" style="{{tabPanelstyle}}">
          <book-brief
            content="{{bookDetail.content}}"
            authorIntroduction="{{bookDetail.authorIntroduction}}"
            wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
          ></book-brief>
          <view
            class="message-li"
            wx:if="{{bookDetail.class}}"
            style="height: 80rpx"
            wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
            class="noData"
          >
            <view class="li-title">图书分类:</view>
            <view class="class-name showTow">{{bookDetail.class}}</view>
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </view>
        <image
          src="/static/images/bookService/detail/square.png"
          class="right-background"
        />
      </view>
    </view>
    <!-- 销售信息 -->
    <view class="book-sale">
      <view class="book-price">
        <!-- 电子书售价 -->
        <view class="electron-price">
          <view>
            <image src="/static/images/bookService/detail/electon-price.png" />
          </view>
          <view class="price">
            <view class="price-text"
              >{{bookDetail.price == '0.00' ? '免费' : '¥'+
              bookDetail.price}}</view
            >
            <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
              >¥{{bookDetail.oldPrice}}
            </view>
          </view>
          <view> </view>
        </view>
        <!-- 纸质书售价 -->
        <view class="paper-price" wx:if="{{bookDetail.paperPrice}}">
          <view>
            <image src="/static/images/bookService/detail/paper-price.png" />
          </view>
          <view class="price"
            >{{bookDetail.paperPrice == '0.00' ? '免费' :
            '¥'+bookDetail.paperPrice}}</view
          >
        </view>
      </view>
      <!-- 网店 -->
      <view class="book-web">
        <image
          src="/static/images/bookService/detail/jd.png"
          wx:if="{{bookDetail.JDLink}}"
          bind:tap="goShop"
          data-link="{{bookDetail.JDLink}}"
          data-type="jd"
        />
        <image
          class="tmall-image"
          src="/static/images/bookService/detail/tmall.png"
          bind:tap="goShop"
          data-link="{{bookDetail.tmallLink}}"
          wx:if="{{bookDetail.tmallLink}}"
        />
        <image
          src="/static/images/bookService/detail/dangdang.png"
          bind:tap="goShop"
          data-link="{{bookDetail.dangdangLink}}"
          wx:if="{{bookDetail.dangdangLink}}"
        />
        <image
          src="/static/images/bookService/detail/weidian.png"
          bind:tap="goShop"
          data-link="{{bookDetail.weidianLink}}"
          wx:if="{{bookDetail.weidianLink}}"
        />
      </view>
    </view>
  </view>
  <view class="book-resource">
    <t-tabs
      defaultValue="{{tabValue}}"
      bind:change="onTabsChange"
      t-class="custom-tabs"
      t-class-content="custom-panel"
      class="tab-class"
    >
      <t-tab-panel label="图书简介" value="brief" style="{{tabPanelstyle}}">
        <book-brief
          content="{{bookDetail.content}}"
          authorIntroduction="{{bookDetail.authorIntroduction}}"
          wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
        ></book-brief>
        <view
          wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
          class="noData"
        </t-tab-panel>
        <t-tab-panel
          label="电子书"
          value="jsek_eBook"
          style="{{tabPanelstyle}}"
        >
          <t-empty icon="folder-open" description="暂无数据" />
        </view>
      </t-tab-panel>
      <t-tab-panel label="电子书" value="jsek_eBook" style="{{tabPanelstyle}}">
        <epub-view
          fileInfo="{{fileInfo}}"
          id="eBook"
          class="webView"
        ></epub-view>
      </t-tab-panel>
      <t-tab-panel
        label="教学资源"
        value="jsek_teachingResources"
        class="{{loading ? 'loading': ''}}"
      >
        <view wx:if="{{!loading && teach.length && !noResources}}">
          <teach-resource
            applyState="{{applyState}}"
            rejectCause="{{rejectCause}}"
            deadline="{{deadline}}"
            bind:applyResource="applyResource"
            applyResourceLoading="{{applyResourceLoading}}"
          ></teach-resource>
          <tree
            openIds="{{openTeachids}}"
            bookInfo="{{bookDetail}}"
            treeList="{{teach}}"
            tab="{{tabValue}}"
            applyState="{{applyState}}"
            bind:downloadTeach="downloadTeach"
            openTeachids="{{openTeachids}}"
            wx:if="{{teach.length}}"
          ></tree>
        </view>
        <t-loading
          theme="circular"
          size="60rpx"
          class="loading"
          loading="{{loading}}"
        />
        <view wx:if="{{noResources}}" class="noData">
          <t-empty icon="folder-open" description="暂无数据" />
        </view>
      </t-tab-panel>
      <t-tab-panel
        label="云学习"
        value="jsek_cloudLearning"
        style="{{tabPanelstyle}}"
      >
        <view wx:if="{{!loading && learn.length}}">
          <learn-resource
            bind:getFreeResource="getFreeResource"
            bind:allAddShoppiingCar="allAddShoppiingCar"
            id="learn-resource"
            buyResourceData="{{buyResourceData}}"
            bookId="{{bookDetail.id}}"
          ></learn-resource>
          <tree
            id="tree"
            openIds="{{openLearnids}}"
            bookInfo="{{bookDetail}}"
            tab="{{tabValue}}"
            treeList="{{learn}}"
            buyIds="{{buyIdList}}"
            openLearnids="{{openLearnids}}"
          ></tree>
        </view>
        <view wx:if="{{noResources}}" class="noData">
          <t-empty icon="folder-open" description="暂无数据" />
        </view>
      </t-tab-panel>
      <t-tab-panel
        label="云测试"
        value="questionBank"
        style="{{tabPanelstyle}}"
      >
        <view wx:if="{{!loading && test.length}}">
          <test-resource
            list="{{test}}"
            bookInfo="{{bookDetail}}"
            mockData="{{mockData}}"
          ></test-resource>
        </view>
        <view wx:if="{{noResources}}" class="noData">
          <t-empty icon="folder-open" description="暂无数据" />
        </view>
      </t-tab-panel>
      <t-tab-panel label="云笔记" value="jsek_note" style="{{tabPanelstyle}}">
        <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
      </t-tab-panel>
    </t-tabs>
  </view>
  <!-- 购买按钮 -->
  <view class="box-bottom">
    <view class="bottom-btn" bind:tap="appplyElectronicBook">
      <view>
        <t-image
          loading=""
          src="/static/images/bookService/detail/ebook.png"
        ></t-image>
      </view>
      <view class="btn-text">电子样书申请</view>
          <epub-view
            fileInfo="{{fileInfo}}"
            id="eBook"
            class="webView"
          ></epub-view>
        </t-tab-panel>
        <t-tab-panel
          label="教学资源"
          value="jsek_teachingResources"
          class="{{loading ? 'loading': ''}}"
        >
          <view wx:if="{{!loading && teach.length && !noResources}}">
            <teach-resource
              applyState="{{applyState}}"
              rejectCause="{{rejectCause}}"
              deadline="{{deadline}}"
              bind:applyResource="applyResource"
              applyResourceLoading="{{applyResourceLoading}}"
            ></teach-resource>
            <tree
              openIds="{{openTeachids}}"
              bookInfo="{{bookDetail}}"
              treeList="{{teach}}"
              tab="{{tabValue}}"
              applyState="{{applyState}}"
              bind:downloadTeach="downloadTeach"
              openTeachids="{{openTeachids}}"
              wx:if="{{teach.length}}"
            ></tree>
          </view>
          <t-loading
            theme="circular"
            size="60rpx"
            class="loading"
            loading="{{loading }}"
          />
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel
          label="云学习"
          value="jsek_cloudLearning"
          style="{{tabPanelstyle}}"
        >
          <view wx:if="{{!loading && learn.length}}">
            <learn-resource
              bind:getFreeResource="getFreeResource"
              bind:allAddShoppiingCar="allAddShoppiingCar"
              id="learn-resource"
              buyResourceData="{{buyResourceData}}"
              bookId="{{bookDetail.id}}"
            ></learn-resource>
            <tree
              id="tree"
              openIds="{{openLearnids}}"
              bookInfo="{{bookDetail}}"
              tab="{{tabValue}}"
              treeList="{{learn}}"
              buyIds="{{buyIdList}}"
              openLearnids="{{openLearnids}}"
            ></tree>
          </view>
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel
          label="云测试"
          value="questionBank"
          style="{{tabPanelstyle}}"
        >
          <view wx:if="{{!loading && test.length}}">
            <test-resource
              list="{{test}}"
              bookInfo="{{bookDetail}}"
              mockData="{{mockData}}"
            ></test-resource>
          </view>
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel label="云笔记" value="jsek_note" style="{{tabPanelstyle}}">
          <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
        </t-tab-panel>
      </t-tabs>
    </view>
    <view class="bottom-btn" bind:tap="appplyPaperBook">
      <view>
        <t-image
          src="/static/images/bookService/detail/paper-book.png"
        ></t-image>
    <!-- 购买按钮 -->
    <view class="box-bottom">
      <view class="bottom-btn" bind:tap="appplyElectronicBook">
        <view>
          <t-image
            loading=""
            src="/static/images/bookService/detail/ebook.png"
          ></t-image>
        </view>
        <view class="btn-text">电子样书申请</view>
      </view>
      <view class="btn-text">纸质样书申请</view>
      <view class="bottom-btn" bind:tap="appplyPaperBook">
        <view>
          <t-image
            src="/static/images/bookService/detail/paper-book.png"
          ></t-image>
        </view>
        <view class="btn-text">纸质样书申请</view>
      </view>
      <view
        class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
        bind:tap="addBookShopcCar"
        wx:if="{{tabValue != 'jsek_eBook'}}"
        >加入购物车</view
      >
      <view
        class="buy  {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
        bind:tap="buyBtn"
        wx:if="{{tabValue != 'jsek_eBook'}}"
        >立即购买</view
      >
      <view
        class="shopCar shopCarColor"
        bind:tap="addBookShopcCar"
        wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
        >加入购物车</view
      >
      <view
        class="buy buyColor"
        bind:tap="buyBtn"
        wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
        >立即购买</view
      >
      <view
        class="read buyColor"
        bind:tap="goRead"
        wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
        >立即查看</view
      >
    </view>
    <view
      class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
      bind:tap="addBookShopcCar"
      wx:if="{{tabValue != 'jsek_eBook'}}"
      >加入购物车</view
    >
    <view
      class="buy  {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
      bind:tap="buyBtn"
      wx:if="{{tabValue != 'jsek_eBook'}}"
      >立即购买</view
    >
    <view
      class="shopCar shopCarColor"
      bind:tap="addBookShopcCar"
      wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
      >加入购物车</view
    >
    <view
      class="buy buyColor"
      bind:tap="buyBtn"
      wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
      >立即购买</view
    >
    <view
      class="read buyColor"
      bind:tap="goRead"
      wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
      >立即查看</view
    >
  </view>
</scroll-view>
<!-- 我要建议弹窗 -->
<suggest
  class="suggest-component"
  id="suggest-component"
  bookIcon="{{bookDetail.icon}}"
  bookName="{{bookDetail.name}}"
></suggest>
<!-- 教学资源下载提示弹窗 -->
<t-dialog
  class="teachDownloadDialog"
  visible="{{isShowTeachDownload}}"
  title="提示"
  content="请前往PC端下载"
  confirm-btn="{{ confirmBtn }}"
  bind:confirm="closeTeachDownload"
/>
  </scroll-view>
  <!-- 我要建议弹窗 -->
  <suggest
    class="suggest-component"
    id="suggest-component"
    bookIcon="{{bookDetail.icon}}"
    bookName="{{bookDetail.name}}"
  ></suggest>
  <!-- 教学资源下载提示弹窗 -->
  <t-dialog
    class="teachDownloadDialog"
    visible="{{isShowTeachDownload}}"
    title="提示"
    content="请前往PC端下载"
    confirm-btn="{{ confirmBtn }}"
    bind:confirm="closeTeachDownload"
  />
<view class="applyBox" bindtap="goApply">
  <view class="box">
    <t-image
      src="/static/images/home/yangshuForm1.png"
      mode="heightFix"
      class="img"
    />
    <view class="num" wx:if="{{num > 0}}">{{num}}</view>
  <view class="applyBox" bindtap="goApply">
    <view class="box">
      <t-image
        src="/static/images/home/yangshuForm1.png"
        mode="heightFix"
        class="img"
      />
      <view class="num" wx:if="{{num > 0}}">{{num}}</view>
    </view>
  </view>
</view>
</view>
packageBookService/pages/bookServices/detail/index.wxss
@@ -223,6 +223,7 @@
.box-bottom {
  position: fixed;
  left: 0;
  bottom: constant(safe-area-inset-bottom);
  bottom: env(safe-area-inset-bottom);
  width: 100%;
  height: 110rpx;
packageBookService/pages/bookServices/examination/examination.js
@@ -472,6 +472,7 @@
        }
        if (mocklist.length && this.data.uuid) {
          const oldMockData = mocklist.find((mockItem) => mockItem.id == this.data.uuid)
          debugger
          this.setData({
            'mockData.state': oldMockData.state,
            'mockData.score': oldMockData.score,
packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -178,9 +178,7 @@
<t-dialog
  class="test-report"
  visible="{{testReportState}}"
  cancel-btn="{{null}}"
  confirm-btn="{{null}}"
  close-btn="{{true}}"
  title="测试报告"
  bind:close="closeTestReportDialog"
>