yiming
2024-04-17 46484b9bea431054820dd30b33f0255aff366ee7
2024417bug
20个文件已修改
786 ■■■■ 已修改文件
packageBookService/pages/bookServices/detail/buyResource/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.wxml 278 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.wxss 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.js 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.wxml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.wxss 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myVideo/index.wxml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myVideo/index.wxss 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.wxss 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionDetails/index.wxml 85 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionDetails/index.wxss 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.js 161 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.wxml 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.wxss 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/cart/paymentPage/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/retrievalPage/index.wxss 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/study/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -148,6 +148,7 @@
                openLearnids: result,
              });
            }
            console.log(list, '云學習');
          } else {
            // 无数据
          }
@@ -197,6 +198,7 @@
        jsek_resourceBrief: [],
        jsek_link: [],
        accessType: [],
        learnSelectType: [],
      },
      pading: {
        start: 0,
packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,94 +1,29 @@
<view class="tree">
  <t-collapse default-value="{{openIds}}" catchchange="handleChange">
    <view
      wx:for="{{treeList}}"
      wx:for-item="item"
      wx:for-index="index"
      wx:key="id"
      wx:if="{{item.sysType== 'CmsItem' }}"
    >
      <view
        class="listItems"
        wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}"
      >
    <view wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" wx:if="{{item.sysType== 'CmsItem' }}">
      <view class="listItems" wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}">
        <view class="itemsInfo" data-item="{{item}}" data-index="{{index}}">
          <view
            class="contentBox"
            bind:tap="goPlayer"
            data-item="{{item}}"
            data-parent="{{''}}"
          >
          <view class="contentBox" bind:tap="goPlayer" data-item="{{item}}" data-parent="{{''}}">
            <!-- 教学资源 云学习 图标 -->
            <view class="box-image" style="width: 100%">
              <view
                class="checkBox"
                wx:if="{{isShowCheck}}"
                catchtap="catchTap"
              >
              <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap">
                <!-- checked="{{citem.checked}}"  -->
                <!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
                <t-checkbox
                  disabled="{{!citem.saleMethod[0].Id}}"
                  icon="rectangle"
                  checked="{{item.checked}}"
                  data-item="{{item}}"
                  data-parent="{{item}}"
                  catch:change="checkResource"
                />
                <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" data-parent="{{item}}" catch:change="checkResource" />
              </view>
              <!-- 教学资源图标 -->
              <view class="teach-icon">
                <image
                  wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}"
                  src="/static/images/bookService/detail/audioIcon.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}"
                  src="/static/images/bookService/detail/video.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{item.selectType == 'pdf'}}"
                  src="/static/images/bookService/detail/pdf.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{item.selectType == 'webpage'}}"
                  src="/static/images/bookService/detail/net.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{item.selectType == 'picture'}}"
                  src="/static/images/bookService/detail/picture.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{item.selectType == 'zip'}}"
                  src="/static/images/bookService/detail/zip.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{ item.fileMap[item.file].extension == 'doc' ||  item.fileMap[item.file].extension == 'docx'}}"
                  src="/static/images/bookService/detail/word.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' ||  item.fileMap[item.file].extension == 'xlsx'}}"
                  src="/static/images/bookService/detail/excel.png"
                  mode="aspectFill"
                />
                <image
                  wx:elif="{{ item.fileMap[item.file].extension == 'ppt' ||  item.fileMap[item.file].extension == 'pptx'}}"
                  src="/static/images/bookService/detail/PPT.png"
                  mode="aspectFill"
                />
                <image wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
                <image wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
                <image wx:elif="{{item.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" />
                <image wx:elif="{{item.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" />
                <image wx:elif="{{item.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" />
                <image wx:elif="{{item.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" />
                <image wx:elif="{{ item.fileMap[item.file].extension == 'doc' ||  item.fileMap[item.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" />
                <image wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' ||  item.fileMap[item.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" />
                <image wx:elif="{{ item.fileMap[item.file].extension == 'ppt' ||  item.fileMap[item.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" />
                <!-- 资源无文件内容图标 -->
                <image
                  wx:else
                  src="/static/images/bookService/detail/word.png"
                  mode=""
                />
                <image wx:else src="/static/images/bookService/detail/word.png" mode="" />
              </view>
              <!-- 云学习图标 -->
              <view> </view>
@@ -108,48 +43,20 @@
            </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 ? false : item.freeFile ? true : false}}"></image>
              <!-- 云学习加入购物车图标 -->
              <image
                src="/static/images/bookService/detail/cart@2x.png"
                wx:if="{{item.isShopCar}}"
                class="shopCar"
                data-item="{{item}}"
                catch:tap="onCloudShoppingCart"
              ></image>
              <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{item.isShopCar}}" 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 }}"
              ></image>
              <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{item.isbuy }}"></image>
            </view>
          </view>
        </view>
      </view>
    </view>
    <t-collapse-panel
      wx:for="{{treeList}}"
      wx:for-item="item"
      wx:for-index="index"
      wx:key="id"
      value="{{item.id}}"
      wx:if="{{item.sysType == 'CmsFolder' }}"
    >
    <t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{item.id}}" wx:if="{{item.sysType == 'CmsFolder' }}">
      <view slot="header" class="header-title">
        <view class="title-checkBox" catchtap="catchTap">
          <t-checkbox
            style="align-items: center"
            icon="rectangle"
            checked="{{item.checked}}"
            data-item="{{item}}"
            catchchange="checkResourceTitle"
            wx:if="{{isShowCheck}}"
          />
          <t-checkbox style="align-items: center" icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" catchchange="checkResourceTitle" wx:if="{{isShowCheck}}" />
          <!-- 章节名 -->
          <view class="title-box">
            <view class="title-name">{{item.name}} </view>
@@ -159,115 +66,40 @@
          </view>
        </view>
      </view>
      <view
        class="list"
        wx:for="{{item.children}}"
        wx:for-item="citem"
        wx:for-index="cindex"
        wx:key="cindex"
      >
      <view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex">
        <!-- // 判断 无子项 且为商品item 直接显示 -->
        <view
          class="listItems"
          wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}"
        >
        <view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}">
          <view class="itemsInfo" data-item="{{citem}}" data-index="{{cindex}}">
            <view
              class="contentBox"
              bind:tap="goPlayer"
              data-item="{{citem}}"
              data-parent="{{item}}"
            >
            <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
              <!-- 教学资源 云学习 图标 -->
              <view
                class="box-image"
                style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}"
              >
                <view
                  class="checkBox"
                  wx:if="{{isShowCheck}}"
                  catchtap="catchTap"
                >
              <view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
                <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap">
                  <!-- checked="{{citem.checked}}"  -->
                  <!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
                  <t-checkbox
                    disabled="{{!citem.saleMethod[0].Id}}"
                    icon="rectangle"
                    checked="{{citem.checked}}"
                    data-item="{{citem}}"
                    data-parent="{{item}}"
                    catch:change="checkResource"
                  />
                  <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" data-parent="{{item}}" catch:change="checkResource" />
                </view>
                <!-- 教学资源图标 -->
                <view class="teach-icon">
                  <image
                    wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}"
                    src="/static/images/bookService/detail/audioIcon.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
                    src="/static/images/bookService/detail/video.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{citem.selectType == 'pdf'}}"
                    src="/static/images/bookService/detail/pdf.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{citem.selectType == 'webpage'}}"
                    src="/static/images/bookService/detail/net.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{citem.selectType == 'picture'}}"
                    src="/static/images/bookService/detail/picture.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{citem.selectType == 'zip'}}"
                    src="/static/images/bookService/detail/zip.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' ||  citem.fileMap[citem.file].extension == 'docx'}}"
                    src="/static/images/bookService/detail/word.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' ||  citem.fileMap[citem.file].extension == 'xlsx'}}"
                    src="/static/images/bookService/detail/excel.png"
                    mode="aspectFill"
                  />
                  <image
                    wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' ||  citem.fileMap[citem.file].extension == 'pptx'}}"
                    src="/static/images/bookService/detail/PPT.png"
                    mode="aspectFill"
                  />
                  <image wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
                  <image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
                  <image wx:elif="{{citem.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" />
                  <image wx:elif="{{citem.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" />
                  <image wx:elif="{{citem.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" />
                  <image wx:elif="{{citem.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" />
                  <image wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' ||  citem.fileMap[citem.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" />
                  <image wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' ||  citem.fileMap[citem.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" />
                  <image wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' ||  citem.fileMap[citem.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" />
                  <!-- 资源无文件内容图标 -->
                  <image
                    wx:else
                    src="/static/images/bookService/detail/word.png"
                    mode=""
                  />
                  <image wx:else src="/static/images/bookService/detail/word.png" mode="" />
                </view>
                <!-- 云学习图标 -->
                <view> </view>
                <!-- 名称 -->
                <text
                  class="name"
                  style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}"
                  >{{citem.name || '-'}}</text
                >
                <text class="name" style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}">{{citem.name || '-'}}</text>
              </view>
              <!-- 教学资源类型 -->
              <view class="teachClass"> {{citem.resourceClass}} </view>
              <view
                class="teach-btn"
                wx:if="{{tab == 'jsek_teachingResources'}}"
              >
              <view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
                <!--  下载按钮 -->
                <!-- <image
                  src="/static/images/bookService/detail/download-icon.png"
@@ -278,41 +110,17 @@
              </view>
              <view wx:if="{{tab == 'jsek_cloudLearning'}}">
                <!-- 云学习试看图标 -->
                <image
                  src="/static/images/bookService/detail/shikan.png"
                  class="testSee"
                  wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"
                ></image>
                <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></image>
                <!-- 云学习加入购物车图标 -->
                <image
                  src="/static/images/bookService/detail/cart@2x.png"
                  wx:if="{{citem.isShopCar}}"
                  class="shopCar"
                  data-item="{{citem}}"
                  catch:tap="onCloudShoppingCart"
                ></image>
                <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{citem.isShopCar}}" class="shopCar" data-item="{{citem}}" catch:tap="onCloudShoppingCart"></image>
                <!-- 云学习购买图标 -->
                <image
                  src="/static/images/bookService/detail/need-buy.png"
                  class="need-buy"
                  wx:if="{{citem.isbuy }}"
                ></image>
                <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></image>
              </view>
            </view>
          </view>
        </view>
        <!-- // 判断 不是商品 有子项 递归组件 -->
        <tree
          wx:if="{{ citem.sysType == 'CmsFolder' }}"
          isShowCheck="{{isShowCheck}}"
          bookInfo="{{bookInfo}}"
          treeList="{{[citem]}}"
          learnList="{{learnList}}"
          itemId="{{itemId}}"
          tab="{{tab}}"
          buyIds="{{buyIds}}"
          openIds="{{openIds}}"
        ></tree>
        <tree wx:if="{{ citem.sysType == 'CmsFolder' }}" isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" learnList="{{learnList}}" itemId="{{itemId}}" tab="{{tab}}" buyIds="{{buyIds}}" openIds="{{openIds}}"></tree>
      </view>
      <!-- 暂无数据 -->
      <view wx:if="{{!item.children || !item.children.length}}" class="noData">
@@ -329,4 +137,4 @@
</view>
<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
<!-- <button bind:tap="sadd"> 65498</button> -->
<!-- <button bind:tap="sadd"> 65498</button> -->
packageBookService/pages/bookServices/detail/components/tree/index.wxss
@@ -83,7 +83,7 @@
.teach-btn {
  display: flex;
  align-items: center;
  align-items: center ;
}
.testSee,
packageBookService/pages/bookServices/detail/index.js
@@ -795,6 +795,7 @@
              });
              console.log('云学习', list);
            }
            console.log(list, '云學習789');
          } else {
            // 无数据
          }
packageBookService/pages/bookServices/detail/index.wxss
@@ -410,9 +410,11 @@
.t-tabs .t-tabs__item--active {
  background-repeat: no-repeat;
  background-size: 30% 40%;
  background-position: 65% 50%;
  background-size: 45% 45%;
  /* background-position: 65% 50%; */
  background-position: right center;
  background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
}
.t-tabs__item--evenly {
packageDomain/pages/resourceDetails/myAudio/index.js
@@ -59,6 +59,7 @@
  // 转化时间
  format(time) {
    let minute = Math.floor(time / 60);
    let second = Math.floor(time % 60);
    minute = minute < 10 ? ("0" + minute) : minute;
@@ -139,6 +140,9 @@
  /**
   * 生命周期函数--监听页面卸载
   *
   * 退出页面时候调用的
   *
   */
  onUnload() {
    // this.setData({
@@ -152,12 +156,14 @@
    // myAudio.src = ''
    // myAudio.destroy()
    // this.setData({
    //   myAudioPos: '',
    //   isplay: false, //是否默认播放,
    //   myAudioCurrent: '00:00', // 当前播放进度
    //   showData: '',
    // });
    this.setData({
      // myAudioPos: '',
      isplay: false, //是否默认播放,
      myAudioCurrent: '00:00', // 当前播放进度
      showData: '',
      speed: 1.0,
    });
    myAudio.playbackRate = this.data.speed;
    // 停止音频播放
    myAudio.stop();
    // 销毁 InnerAudioContext 实例
@@ -266,10 +272,8 @@
        if (item.selectType === "audio" || item.learnSelectType === "audio") {
          this.data.threeLeveData.push(item);
        }
      });
      console.log(this.data.threeLeveData);
      // console.log(this.data.threeLeveData);
      this.data.threeLeveData.forEach((items, indexs) => {
        if (this.data.productLinkPath == items.productLinkPath) {
          selectedId = indexs;
@@ -302,11 +306,14 @@
  },
  onVideo(e) {
    // myAudio.destroy();
    this.setData({
      myAudioCurrent: '00:00',
      myAudioPos: '',
      isplay: false
    })
    const item = e.currentTarget.dataset.item
    if (this.data.showData != '') {
      this.setData({
@@ -325,10 +332,15 @@
          this.pubulicPlayFun()
        } else {
          console.log(item.file, 'item.file');
          console.log(item.freeFile, 'item.freeFile');
          this.setData({
            showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile
          })
          this.pubulicPlayFun()
          console.log(this.data.showData, 'showData');
        }
      }
    }
@@ -592,21 +604,34 @@
  },
  // 播放公共代码
  pubulicPlayFun() {
    // debugger
    console.log(myAudio.src, 'myAudio.src');
    console.log(this.data.showData, 'this.data.showData');
    this.setData({
      speed: 1.0,
    })
    myAudio.playbackRate = this.data.speed;
    myAudio.src = this.data.showData
    // console.log(myAudio.src);
    // 在onCanplay里获取并设置音频时长和播放进度
    myAudio.onCanplay(() => {
      myAudio.duration; //必须写,不然获取不到
      setTimeout(() => {
        this.setData({
          myAudioDuration: this.format(myAudio.duration),
          myAudioCurrent: this.format(myAudio.currentTime)
        });
      }, 100);
    });
    console.log(this.data.myAudioDuration);
    console.log(this.data.myAudioCurrent);
    // 播放完成处理,按钮变一下
    myAudio.onEnded((res) => {
@@ -625,6 +650,10 @@
        myAudioDuration: this.format(myAudio.duration),
      });
    })
    console.log(this.data.myAudioCurrent);
    console.log(this.data.myAudioDuration);
    console.log(this.data.myAudioPos);
    myAudio.play();
  },
packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -2,12 +2,9 @@
<template is="skeleton" wx:if="{{loading}}" />
<view wx:if="{{!hidden}}">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
  <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
    <view>
      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
    </view>
@@ -44,9 +41,12 @@
      </view> -->
        <!-- 时间 -->
        <view class="current-time color">{{myAudioCurrent}} </view>
        <view class="color" style="margin: 0 10rpx">/</view>
        <view class="duration-time color"> {{myAudioDuration}} </view>
        <view class="timeBox">
          <view class="current-time color">{{myAudioCurrent}} </view>
          <view class="color" style="margin: 0 10rpx">/</view>
          <view class="duration-time color"> {{myAudioDuration}} </view>
        </view>
        <!-- bind:tap="onSpeed" -->
        <view class="publicBtn color">
@@ -75,9 +75,14 @@
        <view class="wrapper">
          <t-collapse value="{{activeValues}}" bind:change="handleChange">
            <t-collapse-panel header="{{parentName}}" value="{{0}}" expandIcon>
              <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
                <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}}">{{item.name}}</view>
              <view class="outsideDetailsName">
                <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
                  <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}} ">{{item.name}}</view>
                </view>
              </view>
            </t-collapse-panel>
          </t-collapse>
        </view>
packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -8,12 +8,13 @@
}
.navbar-title {
  white-space: nowrap;
  /* white-space: nowrap;
  text-overflow: ellipsis;
  color: #0F1214;
  font-size: 40rpx;
  font-weight: bold;
  margin-bottom: 5rpx;
  margin-bottom: 5rpx; */
  margin: 0 auto;
}
@@ -118,20 +119,28 @@
  justify-content: center;
}
.outsideDetailsName {
  overflow-y: scroll;
  height: 35vh;
}
.detailsName {
  margin: 30rpx;
  width: 90%;
  min-height: 60rpx;
  display: flex;
  align-items: center;
  padding-left: 20rpx;
  background-color: #FFF6F0
  padding: 20rpx;
  background-color: #FFF6F0;
  line-height: 50rpx;
}
.detailsName:hover {
  background-color: #fff0e6;
  width: 90%;
  height: 60rpx;
  min-height: 60rpx;
  color: #ff6c00;
}
@@ -304,6 +313,7 @@
.bigFunctionBox {
  background: #000000;
  opacity: 0.6;
  width: 100%;
}
.mp-slider-bar {
@@ -358,9 +368,9 @@
  height: 100%;
}
/* .tabs--t-tabs__scroll--split::after {
  height: 0px !important;
} */
.tabs--t-tabs__scroll--split::after {
  height: 0 !important;
}
.buttonBox {
  position: absolute;
@@ -369,4 +379,24 @@
  background-color: #e7e7e7;
  height: 1px;
  z-index: 999;
}
.current-time {
  width: 82rpx;
}
.duration-time {
  width: 82rpx;
}
.timeBox {
  width: 210rpx;
  display: flex;
  flex-direction: row;
}
.wrapper {
  overflow-y: scroll;
  height: 45vh;
}
packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -3,7 +3,7 @@
<view wx:if="{{!hidden}}">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
  <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
    <view>
      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
    </view>
@@ -31,9 +31,13 @@
        <view class="wrapper">
          <t-collapse value="{{activeValues}}" bind:change="handleChange">
            <t-collapse-panel header="{{parentName}}" value="{{0}}" expandIcon>
            <view class="outsideDetailsName" >
              <view class="detailsName" wx:for="{{threeLeveData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="onVideo" data-item="{{item}}" data-index="{{index}}">
                <view style="color: {{selectedId == index ? '#ff6c00' : '#000'}}">{{item.name}}</view>
              </view>
            </view>
            </t-collapse-panel>
          </t-collapse>
        </view>
@@ -42,6 +46,8 @@
      <t-tab-panel label="笔记" value="1" style="{{tabPanelstyle}}">
        <view class="wrapper">
          <view wx:if="{{!noteList.length}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -9,13 +9,14 @@
}
.navbar-title {
  white-space: nowrap;
  /* white-space: nowrap; */
  /* overflow: hidden; */
  text-overflow: ellipsis;
  /* text-overflow: ellipsis;
  color: #0F1214;
  font-size: 40rpx;
  font-weight: bold;
  margin-bottom: 5rpx;
  margin-bottom: 5rpx; */
  margin: 0 auto;
}
.videoBox {
@@ -162,14 +163,15 @@
  display: flex;
  align-items: center;
  padding-left: 20rpx;
  background-color: #FFF6F0
  padding: 20rpx;
  background-color: #FFF6F0;
  line-height: 50rpx;
}
.detailsName:hover {
  background-color: #fff0e6;
  width: 90%;
  height: 60rpx;
  min-height: 60rpx;
  color: #ff6c00;
}
@@ -317,9 +319,9 @@
  margin-top: 120rpx;
}
/* .tabs--t-tabs__scroll--split::after {
.tabs--t-tabs__scroll--split::after {
  height: 0px !important;
} */
}
.buttonBox {
  position: absolute;
@@ -328,4 +330,14 @@
  background-color: #e7e7e7;
  height: 1px;
  z-index: 999;
}
.outsideDetailsName {
  overflow-y: scroll;
  height: 35vh;
}
.wrapper {
  overflow-y: scroll;
  height: 45vh;
}
pages/bibliographyList/index.wxss
@@ -217,4 +217,14 @@
.t-search__input-box--square {
  border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important;
  height: 72rpx;
}
.t-tabs .t-tabs__item--active {
  background-repeat: no-repeat;
  /* background-size: 100% 100%;
  background-position: 100% 100%; */
  background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
  background-position: right center;
  background-size: 40% 90%;
  /* 将背景图片位置设置为靠右 */
}
pages/bookExhibitionDetails/index.wxml
@@ -3,46 +3,53 @@
<template is="skeleton" wx:if="{{loading}}" />
<view hidden="{{hidden}}">
  <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>
    <view class="navbar-title">{{subtitleName}}</view>
  </view>
  <view class="headBox">
    <view class="titleBox">{{bookName}}</view>
    <view class="informationBox">
      <text class="informationNameBox">发布人:{{bookCreator}}</text>
      <text class="informationTimeBox">发布日期:{{bookBeginDate}}</text>
    </view>
  </view>
  <image class="partingBox" src="/static/images/bookExhibitionDetails/Parting.png" mode="aspectFill" />
  <view class="bannerBox">
    <image src="{{bookImage}}" mode="aspectFit" />
  </view>
  <view class="textContent">
    <rich-text nodes="{{bookContent}}"></rich-text>
    <!-- <text>{{bookContent}}</text> -->
  </view>
  <view class="outsideBooksBox">
    <view class="booksBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookDetails">
      <view class="outsideBooksImageBox">
        <image class="booksImageBox" src="{{item.icon}}" mode="" />
<view hidden="{{hidden}}" class="centerBox">
  <view class="tltiBox">
    <view style="width: 100%; height: {{barHeight}}px; "></view>
    <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
      <view>
        <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
      </view>
      <view class="booksTextBox"> <text>{{item.name}}</text></view>
      <view class="boosAuthor">{{item.author}}</view>
      <view class="navbar-title">{{subtitleName}}</view>
    </view>
  </view>
  <view class="outsideHeadBox">
    <view class="headBox">
      <view class="titleBox">{{bookName}}</view>
      <view class="informationBox">
        <text class="informationNameBox">发布人:{{bookCreator}}</text>
        <text class="informationTimeBox">发布日期:{{bookBeginDate}}</text>
      </view>
    </view>
    <image class="partingBox" src="/static/images/bookExhibitionDetails/Parting.png" mode="aspectFill" />
    <view class="bannerBox">
      <image src="{{bookImage}}" mode="aspectFit" />
    </view>
    <view class="textContent">
      <rich-text nodes="{{bookContent}}"></rich-text>
      <!-- <text>{{bookContent}}</text> -->
    </view>
    <view class="outsideBooksBox">
      <view class="booksBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookDetails">
        <view class="outsideBooksImageBox">
          <image src="{{item.icon}}" mode="aspectFit" />
        </view>
        <view class="booksTextBox"> <text>{{item.name}}</text></view>
        <view class="boosAuthor">{{item.author}}</view>
      </view>
    </view>
  </view>
</view>
pages/bookExhibitionDetails/index.wxss
@@ -6,26 +6,28 @@
  background-color: #fff;
  display: flex;
  align-items: center;
  width: 100%;
}
.navbar-title {
  white-space: nowrap;
  /* white-space: nowrap; */
  /* overflow: hidden; */
  text-overflow: ellipsis;
  /* text-overflow: ellipsis;
  color: #0F1214;
  font-size: 40rpx;
  font-weight: bold;
  margin-bottom: 5rpx;
  margin-bottom: 5rpx; */
  /*
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
  color: #0F1214;
  font-size: 40rpx;
  font-weight: bold;
  font-weight: bold; */
  margin: 0 auto;
}
.titleBox {
@@ -89,16 +91,20 @@
  box-sizing: border-box;
}
.booksImageBox {
  width: 240rpx;
  height: 300rpx;
  margin: 30rpx;
}
.outsideBooksImageBox {
  background: #F5F5F5;
  width: 100%;
  margin: 0 auto;
  width: 240rpx;
  height: 300rpx;
  margin: 30rpx;
}
.outsideBooksImageBox image {
  width: 100%;
  height: 100%;
}
.booksTextBox {
@@ -124,4 +130,19 @@
  font-size: 22rpx;
  color: #949494;
  margin: 30rpx 25rpx;
}
.tltiBox {
  position: fixed;
  top: 0;
  background-color: #fff;
  width: 100%;
}
.centerBox {
  position: relative;
}
.outsideHeadBox {
  margin-top: 200rpx;
}
pages/bookExhibitionList/index.js
@@ -8,6 +8,22 @@
   * 页面的初始数据
   */
  data: {
    product: {
      value: 'all',
      options: [{
          value: 'all',
          label: '全部产品',
        },
        {
          value: 'new',
          label: '最新产品',
        },
        {
          value: 'hot',
          label: '最火产品',
        },
      ],
    },
    loading: true,
    hidden: true,
    totalSize: '',
@@ -29,32 +45,32 @@
    sorter: {
      value: 'default',
    },
    product: {
      value: '*',
      options: [{
          value: '*',
          label: '总分类',
        },
        {
          value: 'jsek_bFHigherEducation',
          //重点项目
          price: 'jsek_higherEducation',
          label: '高等教育',
        },
        {
          value: 'jsek_bFVocationalEducation',
          //重点项目
          price: 'jsek_vocationalEducation',
          label: '职业教育',
        },
        {
          value: 'jsek_bFTeacherEducation',
          //重点项目
          price: 'jsek_teacherEducation',
          label: '教师教育',
        },
      ],
    },
    // product: {
    //   value: '*',
    //   options: [{
    //       value: '*',
    //       label: '总分类',
    //     },
    //     {
    //       value: 'jsek_bFHigherEducation',
    //       //重点项目
    //       price: 'jsek_higherEducation',
    //       label: '高等教育',
    //     },
    //     {
    //       value: 'jsek_bFVocationalEducation',
    //       //重点项目
    //       price: 'jsek_vocationalEducation',
    //       label: '职业教育',
    //     },
    //     {
    //       value: 'jsek_bFTeacherEducation',
    //       //重点项目
    //       price: 'jsek_teacherEducation',
    //       label: '教师教育',
    //     },
    //   ],
    // },
    multipleSelect: {
      value: [],
      options: [],
@@ -360,49 +376,52 @@
  },
  // 总分类
  // 总分类
  onChange(e) {
    this.data.page.size = 16 //更改显示的值
    const newValue = e.detail.value;
    const selectedOption = this.data.product.options.find(option => option.value === newValue);
    const newPrice = selectedOption ? selectedOption.price : null;
    const bookExhibitionListsubsidiary = []
    this.setData({
      bookExhibitionListsubsidiary: this.data.bookExhibitionList
    })
    console.log(bookExhibitionListsubsidiary, 'bookExhibitionListsubsidiary');
    console.log(newValue, 'newValue');
    console.log(newPrice, 'newPrice');
    if (newPrice) {
      this.setData({
        keynoteDisabled: false
      })
    }
    if (!newPrice) {
      this.setData({
        keynoteDisabled: true
      })
    }
    this.setData({
      'product.value': newValue,
      'product.price': newPrice, // 将选中的 price 值保存在数据中
    });
    this.bookExhibitionGet(newValue);
    this.keyProjectsGet(newPrice);
    // 调用更新页面数据的函数,传入新的 value 和 price 值
    if (this.data.keynoteValue) {
      //如果有数据就清空并刷新页面
      this.data.keynoteValue = []
      this.bookExhibitionGet(newValue)
      this.onLoad()
    }
    console.log(e);
  },
  // 总分类
  // 总分类
  // onChange(e) {
  //   this.data.page.size = 16 //更改显示的值
  //   const newValue = e.detail.value;
  //   const selectedOption = this.data.product.options.find(option => option.value === newValue);
  //   const newPrice = selectedOption ? selectedOption.price : null;
  //   const bookExhibitionListsubsidiary = []
  //   this.setData({
  //     bookExhibitionListsubsidiary: this.data.bookExhibitionList
  //   })
  //   console.log(bookExhibitionListsubsidiary, 'bookExhibitionListsubsidiary');
  //   console.log(newValue, 'newValue');
  //   console.log(newPrice, 'newPrice');
  //   if (newPrice) {
  //     this.setData({
  //       keynoteDisabled: false
  //     })
  //   }
  //   if (!newPrice) {
  //     this.setData({
  //       keynoteDisabled: true
  //     })
  //   }
  //   console.log(newValue);
  //   this.setData({
  //     'product.value': newValue,
  //     'product.price': newPrice, // 将选中的 price 值保存在数据中
  //   });
  //   this.bookExhibitionGet(newValue);
  //   this.keyProjectsGet(newPrice);
  //   // 调用更新页面数据的函数,传入新的 value 和 price 值
  //   if (this.data.keynoteValue) {
  //     //如果有数据就清空并刷新页面
  //     this.data.keynoteValue = []
  //     this.bookExhibitionGet(newValue)
  //     this.onLoad()
  //   }
  // },
  // 重点项目
  handleMultipleSelect(e) {
@@ -429,8 +448,6 @@
    // 重置操作的处理逻辑
    this.data.keynoteValue = []
    this.bookExhibitionGet()
  },
  onSwapRight() {
@@ -457,12 +474,14 @@
    this.bookExhibitionGet()
  },
  onBookExhibitionDetails: function (event) {
    console.log(456);
    const item = event.currentTarget.dataset.item;
    console.log(item);
    wx.navigateTo({
      url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name + '&subtitleName=' + item.subtitleName // 假设跳转到详情页面,并传递了id参数
    });
  },
  // 搜索框
  onSearchSubmit(e) {
    this.setData({
@@ -481,5 +500,7 @@
    console.log(e.detail.value, 'e.detail.value');
    this.bookExhibitionGet()
  },
  onTest() {
    console.log(7555);
  }
})
pages/bookExhibitionList/index.wxml
@@ -28,8 +28,14 @@
    <view class="outsideMenuBox">
      <view class="menuBox">
        <t-dropdown-menu>
          <!-- <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" /> -->
          <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
          <t-dropdown-item multiple="{{false}}" class="{{keynoteDisabled ? 'disableds' : ' '}}" disabled="{{keynoteDisabled}}" label=" 重点项目" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" show-overlay="{{true}}">
          <!-- disabled="{{keynoteDisabled}}" -->
          <t-dropdown-item label=" 重点项目" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset">
          </t-dropdown-item>
          <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
@@ -60,10 +66,17 @@
    <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
      <view class="outside">
        <!-- <button bind:tap="onTest">点一下</button> -->
        <view wx:if="{{!bookExhibitionList.length }}" class="noData">
          <t-empty icon="folder-open" description="暂无数据" />
        </view>
        <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
        <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookExhibitionDetails">
          <view class="imageBox">
            <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
            <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFit" />
pages/bookExhibitionList/index.wxss
@@ -53,6 +53,7 @@
  -webkit-box-orient: vertical;
  -webkit-line-clamp: 2;
  margin: 20rpx;
  margin-left: 30rpx;
}
@@ -135,7 +136,10 @@
.menuBox {
  display: flex;
  height: 75rpx;
  /* height: 75rpx; */
  margin-top: 10rpx;
  align-items: center;
}
.assembleContent {
@@ -255,6 +259,7 @@
  height: calc(100vh - 300rpx);
  /* width: calc(100vw - 60rpx); */
  /* height: 700rpx; */
}
pages/cart/paymentPage/index.js
@@ -185,6 +185,7 @@
          app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
            console.log(payRes, 'payRes');
            const payVal = JSON.parse(payRes);
            console.log(payVal);
            wx.requestPayment({
              "appId": payVal.appId,
              "timeStamp": payVal.timeStamp,
pages/home/home.wxml
@@ -34,7 +34,7 @@
          <view class="icon">
            <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
          </view>
          <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
          <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex" style="align-items: center;">
            <text class="more">更多</text>
            <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
          </view>
pages/retrievalPage/index.wxss
@@ -384,4 +384,13 @@
/* element.style {
  -webkit-transform: translateX(38.9921875px) !important;
  transform: translateX(38.9921875px) !important;
} */
} */
.t-tabs .t-tabs__item--active {
  background-repeat: no-repeat;
  /* background-size: 100% 100%;
  background-position: 100% 100%; */
  background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
  background-position: right center;
  background-size: 50% 90%;
  /* 将背景图片位置设置为靠右 */
}
pages/study/index.wxml
@@ -29,8 +29,8 @@
        <view wx:if="{{active == '0'}}" class="listBox">
          <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
            <view class="book-img" bind:tap="goBookDetails" data-book="{{item}}">
              <t-image src="{{item.product.icon}}" width="105" height="145" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" />
              <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else />
              <t-image src="{{item.product.icon}}" width="105" height="145" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" mode="aspectFit" />
              <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else mode="aspectFit" />
            </view>
            <view class="body-info" data-book="{{item}}" bindtap="goBookDetails">
              <view class="name">{{item.product.name}}</view>