yiming
2024-04-12 4bc1c36faeec2f90e5acfa836732e49fe0b245e9
云学习11
13个文件已修改
1个文件已添加
449 ■■■■■ 已修改文件
packageBookService/pages/bookServices/detail/components/tree/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.wxml 290 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.js 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.wxml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.wxss 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myVideo/index.wxml 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myVideo/index.wxss 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packagePersonal/pages/aboutUs/index.wxml 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packagePersonal/pages/aboutUs/index.wxss 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.wxss 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionList/index.wxss 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/retrievalPage/index.wxss 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/images/resourceDetails/jibiji/icon@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -514,7 +514,7 @@
            title: "添加成功",
          });
          item.isShopCar = false
          this.triggerEvent("updateCloudLearning")
        }
      }
packageBookService/pages/bookServices/detail/index.js
@@ -1398,16 +1398,23 @@
  },
  updateShoppingCartHidden() {
    const isSHow = this.data.shoppingCartGetId.some(
      (item) => item == data.saleMethod[0].Id
    );
    return !isSHow;
  },
  //刷新购物车图标
  updateCloudLearning() {
    this.getBookInfo()
    this.getShoppingCartProductGet()
    const checkData = this.data.cmsDatas.find(
      (item) => item.refCode == "jsek_cloudLearning"
    );
    this.getResourceData(checkData);
  },
  // éåŽ†æ ‘ç»“æž„è½¬æ¢ä¸ºæ•°ç»„æ–¹æ³•
  handleTreeData(array) {
packageBookService/pages/bookServices/detail/index.wxml
@@ -7,55 +7,30 @@
  <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"
      />
      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
    </view>
    <view class="navbar-title">{{options.name}}</view>
  </view>
  <t-toast id="t-toast" />
  <scroll-view
    scroll-y="{{true}}"
    class="book"
    bindscrolltolower="onReachBottom"
  >
  <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
    <!-- å›¾ä¹¦è¯¦æƒ… -->
    <view class="book-box">
      <view class="book-detail" id="book-detail">
        <view class="detail-left">
          <view class="book-img">
            <image
              loading=""
              src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
              mode="aspectFit"
              aria-label="{{bookDetail.name}}"
            />
            <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" 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}}"
                />
                <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"
                />
                <image loading="" src="/static/images/bookService/detail/suggest.png" />
              </view>
              <view class="use-title">我要建议</view>
            </view>
@@ -80,19 +55,12 @@
              <view class="li-title">出版时间:</view>
              <view class="li-content">{{bookDetail.publicationDate}}</view>
            </view>
            <view
              class="message-li"
              wx:if="{{bookClass.length}}"
              style="height: 80rpx"
            >
            <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx">
              <view class="li-title">图书分类:</view>
              <view class="class-name showTow">{{bookClass}}</view>
            </view>
          </view>
          <image
            src="/static/images/bookService/detail/square.png"
            class="right-background"
          />
          <image src="/static/images/bookService/detail/square.png" class="right-background" />
        </view>
      </view>
      <!-- é”€å”®ä¿¡æ¯ -->
@@ -101,17 +69,12 @@
          <!-- ç”µå­ä¹¦å”®ä»· -->
          <view class="electron-price" wx:if="{{bookDetail.price}}">
            <view>
              <image
                src="/static/images/bookService/detail/electon-price.png"
              />
              <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 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>
@@ -121,68 +84,26 @@
            <view>
              <image src="/static/images/bookService/detail/paper-price.png" />
            </view>
            <view class="price"
              >{{bookDetail.paperPrice == '0.00' ? '免费' :
              'Â¥'+bookDetail.paperPrice}}</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}}"
          />
          <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">
      <movable-area class="movable-area">
        <t-tabs
          value="{{tabValue}}"
          bind:change="onTabsChange"
          t-class="custom-tabs"
          t-class-content="custom-panel"
          class="tab-class"
        >
          <t-tab-panel
            label="图书简介"
            icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
            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-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
          <t-tab-panel label="图书简介" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" 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-empty icon="folder-open" description="暂无数据" />
            </view>
          </t-tab-panel>
@@ -193,34 +114,10 @@
          style="{{tabPanelstyle}}"
        >
        </t-tab-panel> -->
          <t-tab-panel
            label="教学资源"
            icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
            value="jsek_teachingResources"
            class="{{loading ? 'loading': ''}}"
          >
            <view
              wx:if="{{!loading && teach.length && !noResources && applyState}}"
            >
              <teach-resource
                applyState="{{applyState}}"
                rejectCause="{{rejectCause}}"
                deadline="{{deadline}}"
                bind:applyResource="applyResource"
                applyResourceLoading="{{applyResourceLoading}}"
              ></teach-resource>
              <tree
                id="teach-tree"
                openIds="{{openTeachids}}"
                bookInfo="{{bookDetail}}"
                treeList="{{teach}}"
                tab="{{tabValue}}"
                applyState="{{applyState}}"
                bind:downloadTeach="downloadTeach"
                bind:handleTree="handleTree"
                openTeachids="{{openTeachids}}"
                wx:if="{{teach.length}}"
              ></tree>
          <t-tab-panel label="教学资源" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
            <view wx:if="{{!loading && teach.length && !noResources && applyState}}">
              <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
              <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree>
            </view>
            <!-- <t-loading
              theme="circular"
@@ -229,100 +126,47 @@
              loading="{{loading }}"
            /> -->
            <view wx:if="{{loading}}" style="width: 100%; height: min-content">
<<<<<<< Updated upstream
              <t-skeleton
                row-col="{{rowCol}}"
                theme="paragraph"
                animation="gradient"
                loading="{{loading}}"
              ></t-skeleton>
=======
              <t-skeleton row-col="{{[1,1,2,1,1,2]}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton>
>>>>>>> Stashed changes
            </view>
            <view wx:if="{{noResources}}" class="noData">
              <t-empty icon="folder-open" description="暂无数据" />
            </view>
          </t-tab-panel>
          <t-tab-panel
            label="云学习"
            icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
            value="jsek_cloudLearning"
            style="{{tabPanelstyle}}"
          >
          <t-tab-panel label="云学习" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" 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}}"
                isshowDrawBtn="{{isshowDrawBtn}}"
              ></learn-resource>
              <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource>
              <tree
                id="tree"
                openIds="{{openLearnids}}"
                bookInfo="{{bookDetail}}"
                tab="{{tabValue}}"
                treeList="{{learn}}"
                buyIds="{{buyIdList}}"
                openLearnids="{{openLearnids}}"
                bind:updateShoppingCartHidden="updateShoppingCartHidden"
                bind:updateCloudLearning="updateCloudLearning"
              ></tree>
              <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
            </view>
            <view wx:if="{{noResources}}" class="noData">
              <t-empty icon="folder-open" description="暂无数据" />
            </view>
          </t-tab-panel>
          <t-tab-panel
            label="云测试"
            icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
            value="questionBank"
            style="{{tabPanelstyle}}"
          >
          <t-tab-panel label="云测试" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
            <view wx:if="{{!loading}}">
              <test-resource
                id="test-resource"
                list="{{test}}"
                bookInfo="{{bookDetail}}"
                mockData="{{mockData}}"
                bind:buyMock="buyMock"
              ></test-resource>
              <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></test-resource>
            </view>
          </t-tab-panel>
          <t-tab-panel
            label="云笔记"
            icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
            value="jsek_note"
            style="{{tabPanelstyle}}"
          >
          <t-tab-panel label="云笔记" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
            <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
          </t-tab-panel>
          <t-tab-panel
            label="相关图书"
            icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
            value="related_books"
            style="{{tabPanelstyle}}"
          >
            <related-books
              relatedBookData="{{relatedBookData}}"
              relatedBookLoading="{{relatedBookLoading}}"
              noRelatedBookData="{{noRelatedBookData}}"
              bind:goBookDetails="goBookDetails"
            ></related-books>
          <t-tab-panel label="相关图书" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
            <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
          </t-tab-panel>
        </t-tabs>
        <movable-view
          class="movable-view"
          :x="{{x}}"
          :y="{{y}}"
          direction="all"
        >
        <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
          <view class="applyBox" bindtap="goApply">
            <view class="box">
              <t-image
                src="/static/images/home/yangshuForm1.png"
                mode="heightFix"
                class="img"
              />
              <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
              <view class="num" wx:if="{{num > 0}}">{{num}}</view>
            </view>
          </view>
@@ -331,73 +175,37 @@
    </view>
  </scroll-view>
  <!-- æˆ‘要建议弹窗 -->
  <suggest
    class="suggest-component"
    id="suggest-component"
    bookIcon="{{bookDetail.icon}}"
    bookName="{{bookDetail.name}}"
  ></suggest>
  <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"
  />
  <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="提示" content="请前往PC端下载" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
  <!-- è´­ä¹°æŒ‰é’® -->
  <view class="box-bottom">
    <view class="bottom-btn" bind:tap="appplyElectronicBook">
      <view>
        <t-image
          loading=""
          src="/static/images/bookService/detail/ebook.png"
        ></t-image>
        <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
      </view>
      <view class="btn-text">电子样书申请</view>
    </view>
    <view class="bottom-btn" bind:tap="appplyPaperBook">
      <view>
        <t-image
          src="/static/images/bookService/detail/paper-book.png"
        ></t-image>
        <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
      </view>
      <view class="btn-text">纸质样书申请</view>
    </view>
    <view
      class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
      bind:tap="goRead"
      wx:if="{{!bookBuy}}"
    >
    <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy}}">
      <view>
        <t-image src="/static/images/bookService/detail/shidu.png"></t-image>
      </view>
      <view class="btn-text">试读</view>
    </view>
    <view
      class="shopCar shopCarColor"
      bind:tap="addBookShopcCar"
      wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
      >加入购物车</view
    >
    <view
      class="buy buyColor"
      bind:tap="buyBtn"
      wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
      >立即购买</view
    >
    <view
      class="buy receiveColor"
      bind:tap="buyBtn"
      wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
      >免费领取</view
    >
    <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">加入购物车</view>
    <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">立即购买</view>
    <view class="buy receiveColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}">免费领取</view>
    <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">立即查看</view>
  </view>
</view>
<!-- <view class="loading" wx:if="{{pageLoading}}">
  <t-loading loading="{{pageLoading}}" size="40"></t-loading>
</view> -->
</view> -->
packageDomain/pages/resourceDetails/myAudio/index.js
@@ -159,9 +159,9 @@
    //   showData: '',
    // });
    // åœæ­¢éŸ³é¢‘播放
    myAudio.stop();
    // myAudio.stop();
    // é”€æ¯ InnerAudioContext å®žä¾‹
    myAudio.destroy();
    // myAudio.destroy();
  },
  count(timeStr) {
    const data = {
@@ -233,6 +233,7 @@
    wx.navigateBack();
  },
  resourceDetailsData() {
    let datas = ''
    let query = {
      path: '*',
      queryType: '*',
@@ -264,29 +265,33 @@
          this.setData({
            threeLeveData: this.data.threeLeveData
          })
          this.data.threeLeveData.forEach((items, index) => { // ä¿®æ”¹æ­¤å¤„添加index参数
            if (this.data.productLinkPath == items.productLinkPath) {
              if (this.data.formPath == 'jsek_cloudLearning') {
                // è¿™é‡Œå¤„理云学习的
                this.setData({
                  showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + items.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
                  titleName: items.name
                })
                this.pubulicPlayFun()
              } else {
                this.setData({
                  showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file,
                  titleName: items.name
                })
                this.pubulicPlayFun()
              }
              let selectedIndex = index; // å­˜å‚¨é€‰ä¸­é¡¹çš„索引
              this.setData({
                selectedId: selectedIndex // è®¾ç½®é€‰ä¸­é¡¹çš„索引
              });
            }
          });
        }
        this.data.threeLeveData.forEach((items, index) => { // ä¿®æ”¹æ­¤å¤„添加index参数
          if (this.data.productLinkPath == items.productLinkPath) {
            datas = items
            let selectedIndex = index; // å­˜å‚¨é€‰ä¸­é¡¹çš„索引
            this.setData({
              selectedId: selectedIndex // è®¾ç½®é€‰ä¸­é¡¹çš„索引
            });
          }
        });
        if (this.data.formPath == 'jsek_cloudLearning') {
          // è¿™é‡Œå¤„理云学习的
          this.setData({
            showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey),
            titleName: datas.name
          })
          this.pubulicPlayFun()
        } else {
          this.setData({
            showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file,
            titleName: datas.name
          })
          this.pubulicPlayFun()
        }
      })
      this.data.threeLeveData.forEach((item) => {})
      this.setData({
@@ -591,15 +596,14 @@
    // åœ¨onCanplay里获取并设置音频时长和播放进度
    myAudio.onCanplay(() => {
      myAudio.duration; //必须写,不然获取不到
      this.setData({
        myAudioDuration: this.format(myAudio.duration),
      })
      setTimeout(() => {
        this.setData({
          myAudioDuration: this.format(myAudio.duration),
          myAudioCurrent: this.format(myAudio.currentTime)
        });
      }, 100);
    });
@@ -613,7 +617,7 @@
    //进度条变化   
    myAudio.onTimeUpdate(() => {
      console.log(this.format(myAudio.duration));
      // console.log(this.format(myAudio.duration));
      this.setData({
        myAudioPos: myAudio.currentTime / myAudio.duration * 100,
        myAudioCurrent: this.format(myAudio.currentTime),
packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -112,9 +112,10 @@
    <!-- è®°ç¬”è®° -->
    <view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
      <view class="takeNotesLining">
        <image src="/static/images/resourceDetails/jibijii.png" mode="" /> è®°ç¬”è®°
        <image src="/static/images/resourceDetails/jibiji/icon@2x.png" mode="" /> è®°ç¬”è®°
      </view>
    </view>
    <view class="buttonBox"></view>
  </view>
  <!-- è®°ç¬”记弹窗 -->
packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -49,7 +49,7 @@
  top: 0rpx;
  right: 0;
  width: 353rpx;
  border-bottom: 1rpx solid #e7e7e7;
  /* border-bottom: 1rpx solid #e7e7e7; */
}
.takeNotes image {
@@ -356,4 +356,17 @@
.pauseCircleBox image {
  width: 100%;
  height: 100%;
}
.tabs--t-tabs__scroll--split::after {
  height: 0px !important;
}
.buttonBox {
  position: absolute;
  top: 95rpx;
  width: 100%;
  background-color: #e7e7e7;
  height: 1px;
  z-index: 999;
}
packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -72,9 +72,10 @@
    <!-- è®°ç¬”è®° -->
    <view class="takeNotes" data-key="showCloseBtn" bind:tap="showDialog">
      <view class="takeNotesLining">
        <image src="/static/images/resourceDetails/jibijii.png" mode="" /> è®°ç¬”è®°
        <image src="/static/images/resourceDetails/jibiji/icon@2x.png" mode="" /> è®°ç¬”è®°
      </view>
    </view>
    <view class="buttonBox"></view>
  </view>
@@ -90,26 +91,16 @@
          <t-input value="{{submitTitle}}" style="{{inputStyle}}" data-value="{{false}}" bind:enter="changeTitle" bind:blur="changeTitle" maxlength="{{50}}" bind:change="inputChange"></t-input>
        </view>
      </view>
      <view slot='content'>
        <view class="textarea-example">
          <text class="textarea-example__label">内容:</text>
          <t-textarea value="{{textvalue}}" t-class="external-class" placeholder="请输入文字" bordered maxlength="500" disableDefaultPadding="{{true}}" indicator style="{{inputStyle}}" bind:change="textareaChange" />
        </view>
        <view class="submit-btn">
          <t-button theme="primary" size="large" block bind:tap="confirmSuggest">提交</t-button>
        </view>
      </view>
    </view>
    <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="closeDialog" />
  </t-popup>
</view>
packageDomain/pages/resourceDetails/myVideo/index.wxss
@@ -77,7 +77,7 @@
  top: 0rpx;
  right: 0;
  width: 353rpx;
  border-bottom: 1rpx solid #e7e7e7;
  /* border-bottom: 1rpx solid #e7e7e7; */
}
.takeNotes image {
@@ -315,4 +315,17 @@
.noData {
  margin-top: 120rpx;
}
.tabs--t-tabs__scroll--split::after {
  height: 0px !important;
}
.buttonBox {
  position: absolute;
  top: 95rpx;
  width: 100%;
  background-color: #e7e7e7;
  height: 1px;
  z-index: 999;
}
packagePersonal/pages/aboutUs/index.wxml
@@ -5,12 +5,17 @@
<view class="aboutUsBox" hidden="{{hidden}}">
  <view class="titleBox">
    <view style="width: 100%; height: {{barHeight}}px; "></view>
    <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
    <view class="nacigationBar" style="width: 90%; height: {{navBarHeight}}px;">
      <view>
        <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
      </view>
      <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">关于我们</view>
      <view wx:else class="navbar-title">联系我们</view>
      <view class="titleTextBox">
        <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">关于我们</view>
        <view wx:else class="navbar-title">联系我们</view>
      </view>
    </view>
  </view>
packagePersonal/pages/aboutUs/index.wxss
@@ -6,17 +6,18 @@
  background-color: #fff;
  display: flex;
  align-items: center;
  margin-bottom: 50rpx;
}
.navbar-title {
  white-space: nowrap;
  /* overflow: hidden; */
  /* white-space: nowrap;
  text-overflow: ellipsis;
  color: #0F1214;
  margin-bottom: 5rpx;
  font-weight: bold;
  font-size: 36rpx;
  color: #0F1214;
  color: #0F1214; */
}
image {
@@ -82,4 +83,9 @@
.richTextBox table {
  border-width: 2px !important;
}
.titleTextBox {
  margin: 0 auto;
}
pages/bibliographyList/index.wxss
@@ -212,4 +212,9 @@
  /* border: 1rpx #000 solid; */
  background-color: #ccc;
  /* width: 100%; */
}
.t-search__input-box--square {
  border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important;
  height: 72rpx;
}
pages/bookExhibitionList/index.wxss
@@ -269,4 +269,10 @@
  margin-top: 100rpx;
  display: flex;
  justify-content: center;
}
.t-search__input-box--square {
  border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important;
  height: 72rpx;
}
pages/retrievalPage/index.wxss
@@ -266,11 +266,6 @@
  /* margin-top: 300rpx; */
}
/* ä¸“题 */
.listBox {
  padding: 20rpx 0;
@@ -375,4 +370,9 @@
.scrollViewBox {
  height: calc(100vh - 326rpx);
  /* width: calc(100vw - 60rpx); */
}
.t-search__input-box--square {
  border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important;
  height: 72rpx;
}
static/images/resourceDetails/jibiji£¯icon@2x.png