yiming
2024-04-25 103db27cd0ca6b3305e95170dc297380f97fcc70
bug3
1个文件已删除
27个文件已修改
1625 ■■■■ 已修改文件
app.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
assets/js/config.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/components/tree/components/util.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/detail/index.wxss 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageBookService/pages/bookServices/list/index.wxss 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/document/index.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/document/index.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/document/index.wxml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/document/index.wxss 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myAudio/index.js 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/resourceDetails/myVideo/index.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.wxml 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bibliographyList/index.wxss 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionDetails/index.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionDetails/index.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionDetails/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/bookExhibitionDetails/index.wxss 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/cart/paymentPage/index.js 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/cart/paymentPage/index.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/cart/paymentPage/index.wxml 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/cart/paymentPage/index.wxss 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/cart/paymentPage/js/weapp.qrcode.js 1281 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/retrievalPage/index.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/retrievalPage/index.wxss 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app.json
@@ -105,7 +105,6 @@
  "window": {
    "backgroundTextStyle": "light",
    "navigationBarBackgroundColor": "#fff",
    "navigationBarTitleText": "京师E课",
    "navigationBarTextStyle": "black"
  },
  "sitemapLocation": "sitemap.json",
assets/js/config.js
@@ -1,7 +1,7 @@
// export const requestCtx = "http://182.92.203.7:3001"; // 请求地址
// export const appId = 27;
export const requestCtx = "https://jsek.bnuic.com"; // 请求地址
export const appId = 3;
export const requestCtx = "http://182.92.203.7:3001"; // 请求地址
export const appId = 27;
// export const requestCtx = "https://jsek.bnuic.com"; // 请求地址
// export const appId = 3;
// export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
export const epubUrl = "https://jsek.bnuic.com/epubReadMobile/#/";
export const pdfUrl = "http://182.92.203.7:3007/pdfRead/";
packageBookService/pages/bookServices/detail/components/tree/components/util.js
@@ -11,7 +11,7 @@
  wx.hideNavigationBarLoading()
}
const hideLoadingWithErrorTips = (err = '加载失败...') => {
const hideLoadingWithErrorTips = (err = '资源不可用,请联系管理员') => {
  hideLoading()
  wx.showToast({
    title: err,
@@ -24,4 +24,4 @@
  showLoading: showLoading,
  hideLoading: hideLoading,
  hideLoadingWithErrorTips: hideLoadingWithErrorTips,
}
}
packageBookService/pages/bookServices/detail/index.js
@@ -1477,8 +1477,6 @@
        const confirmOrderRes = await app.MG.store.confirmOrder(parameter);
        console.log(confirmOrderRes.orderNumber, 'confirmOrderRes.orderNumber');
        if (confirmOrderRes.orderNumber) {
          child.changeReceive(false);
          wx.showToast({
packageBookService/pages/bookServices/detail/index.wxml
@@ -145,7 +145,7 @@
          </t-tab-panel>
          <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}}"   successOrderNumber="{{successOrderNumber}}" ></learn-resource>
              <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}" successOrderNumber="{{successOrderNumber}}"></learn-resource>
              <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
            </view>
packageBookService/pages/bookServices/detail/index.wxss
@@ -461,6 +461,6 @@
  overflow-x: auto;
}
.t-collapse-panel__content {
/* .t-collapse-panel__content {
  padding: 0rpx !important;
}
} */
packageBookService/pages/bookServices/list/index.wxss
@@ -1,5 +1,6 @@
/* pages/bookServices/list/index.wxss */
@import "./index.skeleton.wxss";
page {
  background-color: #f7f7f7;
}
@@ -253,4 +254,8 @@
.refresh-container {
  margin: 0 auto;
}
.t-radio {
  font-size: var(--td-radio-font-size, 28rpx) !important;
}
packageDomain/pages/resourceDetails/document/index.js
@@ -30,6 +30,18 @@
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    wx.setNavigationBarTitle({
      title: '资源详情'
    });
    console.log(options);
    const systInfo = wx.getSystemInfoSync();
    const menu = wx.getMenuButtonBoundingClientRect(); // 胶囊信息
@@ -252,7 +264,7 @@
    console.log(item, 'item11111');
    if (item.selectType == 'picture') {
      this.setData({
        showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
      })
packageDomain/pages/resourceDetails/document/index.json
@@ -4,6 +4,5 @@
    "t-icon": "tdesign-miniprogram/icon/icon",
    "t-button": "tdesign-miniprogram/button/button",
    "t-image": "tdesign-miniprogram/image/image"
  },
  "navigationStyle": "custom"
  }
}
packageDomain/pages/resourceDetails/document/index.wxml
@@ -1,4 +1,4 @@
<view style="width: 100%; height: {{barHeight}}px; "></view>
<!-- <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" />
@@ -6,11 +6,11 @@
  <view class="navbar-title">资源详情</view>
</view>
-->
<view class="titleNameBox" wx:if="{{selectType != 'webpage'}}">
  {{titleName}}
</view>
<view class="pictureBox" wx:if="{{selectType == 'picture'}}">
  <image src="{{showData}}" mode="aspectFit" />
packageDomain/pages/resourceDetails/document/index.wxss
@@ -59,6 +59,7 @@
.pictureBox {
  display: flex;
  justify-content: center;
  margin-top: 160rpx;
}
.pictureBox image {
packageDomain/pages/resourceDetails/myAudio/index.js
@@ -120,7 +120,6 @@
    }
    this.resourceDetailsData()
    this.getNoteList()
    console.log(options, 'options');
  },
  /**
@@ -289,7 +288,6 @@
          this.data.threeLeveData.push(item);
        }
      });
      // console.log(this.data.threeLeveData);
      this.data.threeLeveData.forEach((items, indexs) => {
        if (this.data.productLinkPath == items.productLinkPath) {
          selectedId = indexs;
@@ -302,7 +300,6 @@
        if (this.data.formPath == 'jsek_cloudLearning') {
          showDataUrl = app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + datas.protectedFile + '&token=' + wx.getStorageSync(app.config.tokenKey);
        } else {
          console.log(datas);
          showDataUrl = datas.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + datas.freeFile
        }
        titleName = datas.name;
@@ -348,14 +345,13 @@
          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');
        }
      }
@@ -367,7 +363,6 @@
      productId: this.data.bookId,
      appRefCode: app.config.appRefCode
    }).then((res) => {
      // console.log(res);
      this.setData({
        topicId: res.id
      })
@@ -386,13 +381,13 @@
      newDataListRequest: []
    }
    app.MG.ugc.newTopicMessage(query).then(res => {
      // console.log(res);
    })
  },
  // 标题改变
  changeTitle(e) {
    // console.log(e.currentTarget.dataset.value);
    this.setData({
      flag: e.currentTarget.dataset.value
    })
@@ -422,8 +417,7 @@
    } else if (this.data.submitType == 'edit') {
      this.updateNote()
    }
    // console.log(this.data.textvalue);
    // console.log(this.data.titleName);
    this.setData({
      dialogKey: false
    });
@@ -432,7 +426,7 @@
  },
  onTextarea() {
    // console.log(this.data.textvalue);
  },
  textareaChange(e) {
    this.setData({
@@ -481,9 +475,8 @@
      this.setData({
        "pageCount.total": res.totalSize,
        noteList: res.datas,
        // loading: false
      })
      // console.log('笔记列表', res.datas);
    })
  },
  // 编辑按钮
@@ -497,7 +490,7 @@
      noteId: note.id,
      dialogKey: true,
    })
    console.log(this.data.submitTitle);
    // this.showDialog()
  },
@@ -534,15 +527,7 @@
  },
  // 新建笔记接口
  async makeNote() {
    // const token = wx.getStorageSync('jsek-token')
    // if (!token) {
    //   return wx.getUserProfile({
    //     desc: '用户登录',
    //     success: (res) => {
    //       // console.log(res);
    //     }
    //   })
    // }
    let topicId
    await app.MG.ugc
      .getProductUserSubmitTopic({
@@ -620,23 +605,14 @@
  },
  // 播放公共代码
  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({
@@ -646,8 +622,7 @@
      }, 100);
    });
    console.log(this.data.myAudioDuration);
    console.log(this.data.myAudioCurrent);
    // 播放完成处理,按钮变一下
    myAudio.onEnded((res) => {
@@ -659,17 +634,13 @@
    //进度条变化   
    myAudio.onTimeUpdate(() => {
      // console.log(this.format(myAudio.duration));
      this.setData({
        myAudioPos: myAudio.currentTime / myAudio.duration * 100,
        myAudioCurrent: this.format(myAudio.currentTime),
        myAudioDuration: this.format(myAudio.duration),
      });
    })
    console.log(this.data.myAudioCurrent);
    console.log(this.data.myAudioDuration);
    console.log(this.data.myAudioPos);
    myAudio.play();
@@ -730,7 +701,7 @@
  // 左右切换
  changeItem(item) {
    console.log(item);
    if (this.data.showData != '') {
      this.setData({
@@ -764,7 +735,7 @@
    }
    setTimeout(() => {
      console.log(this.data.speed, 'this.data.speed');
      myAudio.startTime = this.data.myAudioDuration //开始时间  
      myAudio.playbackRate = this.data.speed; //  播放速率
    }, 200);
@@ -772,13 +743,13 @@
  // 拖动进度条,到指定位置
  hanle_slider_change(e) {
    console.log();
    const position = e.detail.value;
    var currentTime = position / 100 * myAudio.duration;
    myAudio.seek(currentTime);
    this.setData({
      myAudioPos: position,
      myAudioCurrent: this.format(currentTime)
    })
  },
@@ -829,16 +800,5 @@
      myAudio.playbackRate = this.data.speed; //  播放速率
    }, 200);
  },
  // 云学习处理已购买正式文件
  handleFile() {
    console.log(1111);
  },
  // 云学习试看处理
  handleFreeFile() {
    console.log(2222);
  },
  // 判断资源是否购买
  resourceIsBuy() {
    console.log(333);
  }
})
packageDomain/pages/resourceDetails/myVideo/index.js
@@ -34,13 +34,13 @@
    style: 'height: 248rpx',
    submitType: "new", //  新建 or 编辑
    noteId: '',
    videoChange: true,
    startTime: "", //进入页面当前时间
    pauseTime: 0, //暂停时间
    formPath: '',
    loading: true,
    hidden: true
    hidden: true,
    videoError: false
  },
  // 格式化笔记时间
  convertTimestamp(timestamp) {
@@ -60,9 +60,7 @@
  onLoad(options) {
    wx.setNavigationBarTitle({
      title: '资源详情-音频'
      title: '资源详情-视频'
    });
    const systInfo = wx.getSystemInfoSync();
    const menu = wx.getMenuButtonBoundingClientRect(); // 胶囊信息
@@ -248,7 +246,7 @@
                })
              } else {
                this.setData({
                  showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + items.file,
                  showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
                  titleName: items.name
                })
              }
@@ -298,7 +296,7 @@
        })
      } else {
        this.setData({
          showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
          showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
        })
      }
@@ -564,5 +562,11 @@
  },
  videoErrorCallback(e) {
    console.log(e);
  },
  videoError: function (e) {
    console.log('视频加载失败', e);
    this.setData({
      videoError: true
    });
  }
})
pages/bibliographyList/index.js
@@ -1,4 +1,5 @@
// pages/bibliographyList/index.js
import Toast from 'tdesign-miniprogram/toast/index';
const app = getApp()
const config =
  Page({
@@ -310,20 +311,32 @@
      const item = event.currentTarget.dataset.item
      console.log(item);
      wx.navigateTo({
        url: "/packageBookService/pages/components/webView/index?md5=" +
          item.freeFile +
          "&fileName=" +
          item.name +
          "&fileType=" +
          item.fileType + "&bookBuy=true"
        // "&freePage=" +
        // this.data.fileInfo.freePage +
      if (item.fileType == "pdf") {
        wx.navigateTo({
          url: "/packageBookService/pages/components/webView/index?md5=" +
            item.freeFile +
            "&fileName=" +
            item.name +
            "&fileType=" +
            item.fileType + "&bookBuy=true"
          // "&freePage=" +
          // this.data.fileInfo.freePage +
        // +
        // "&bookId=" +
        // this.data.bookDetail.id,
      });
          // +
          // "&bookId=" +
          // this.data.bookDetail.id,
        });
      } else {
        Toast({
          context: this,
          selector: '#t-toast',
          message: '此书不能查看',
          theme: 'warning',
          direction: 'column',
        });
        console.log(456);
      }
    },
pages/bibliographyList/index.json
@@ -10,7 +10,8 @@
    "t-empty": "tdesign-miniprogram/empty/empty",
    "t-button": "tdesign-miniprogram/button/button",
    "t-input": "tdesign-miniprogram/input/input",
    "t-dialog": "tdesign-miniprogram/dialog/dialog"
    "t-dialog": "tdesign-miniprogram/dialog/dialog",
    "t-toast": "tdesign-miniprogram/toast/toast"
  },
  "navigationStyle": "custom",
  "enablePullDownRefresh": true,
pages/bibliographyList/index.wxml
@@ -24,9 +24,6 @@
            <t-search model:value="{{value}}" placeholder="请输入书目名称" bind:submit="onSearchSubmit">
            </t-search>
            <!-- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" /> -->
          </view>
        </view>
@@ -47,8 +44,9 @@
          <view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
            <view class="outsideHigherImageBox">
              <view class="higherImageBox">
                <image wx:if="{{item.icon}}" data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
                <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" />
                <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" data-item="{{item}}" bind:tap="downloadData" />
                <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
                  <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
                  <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
@@ -76,7 +74,7 @@
            <view class="outsideHigherImageBox">
              <view class="higherImageBox">
                <image wx:if="{{item.icon}}" data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
                <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" />
                <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" data-item="{{item}}" bind:tap="downloadData" />
                <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
                  <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
                  <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
@@ -103,7 +101,7 @@
            <view class="outsideHigherImageBox">
              <view class="higherImageBox">
                <image wx:if="{{item.icon}}" data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
                <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" />
                <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" data-item="{{item}}" bind:tap="downloadData" />
                <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
                  <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
                  <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
@@ -130,4 +128,5 @@
    </t-dialog>
  </view>
</view>
</view>
<t-toast id="t-toast" />
pages/bibliographyList/index.wxss
@@ -27,8 +27,9 @@
.higherBox {
  width: 220rpx;
  /* height: 390rpx; */
  box-shadow: 10rpx 10rpx 10rpx 10rpx rgba(0, 0, 0, 0.08);
  /* box-shadow: 10rpx 10rpx 10rpx 10rpx rgba(0, 0, 0, 0.08); */
  margin: 30rpx 15rpx;
  background-color: #fff;
}
.outsideHigherBox {
@@ -116,6 +117,7 @@
.t-tabs__track {
  background-color: #FF6C00 !important;
  /* height: var(--td-tab-track-thickness, 0rpx) !important; */
}
.bottom-box {
@@ -157,11 +159,7 @@
}
.contentBox {
  margin-top: 200rpx;
  /*
  -webkit-transform: translateX(52.796875px);
  transform: translateX(52.796875px); */
  margin-top: 180rpx;
}
.noDataBox {
@@ -228,11 +226,15 @@
  /* background-size: 100% 100%;
  background-position: 100% 100%; */
  background-image: url(https://jsek.bnuic.com/home/image/click-icon.png);
  background-position: 90% center;
  background-size: 30% 60%;
  background-position: 85% center;
  background-size: 30% 50%;
  /* 将背景图片位置设置为靠右 */
}
.t-search__input-box .t-input__keyword {
  font-size: var(--td-search-font-size, var(--td-font-size-m, 28rpx)) !important;
}
page {
  background: #F2F3F8;
}
pages/bookExhibitionDetails/index.js
@@ -27,6 +27,8 @@
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    const systInfo = wx.getSystemInfoSync();
    const menu = wx.getMenuButtonBoundingClientRect(); // 胶囊信息
    const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 导航栏高度
@@ -47,6 +49,10 @@
    this.bookExhibitionGet(passId)
    this.getBookExhibitionDetails()
    wx.setNavigationBarTitle({
      title: this.data.subtitleName
    });
  },
  /**
pages/bookExhibitionDetails/index.json
@@ -4,7 +4,6 @@
    "t-icon": "tdesign-miniprogram/icon/icon",
    "t-loading": "tdesign-miniprogram/loading/loading"
  },
  "navigationStyle": "custom",
  "enablePullDownRefresh": true,
  "onReachBottomDistance": 200
}
pages/bookExhibitionDetails/index.wxml
@@ -4,7 +4,7 @@
<view hidden="{{hidden}}" class="centerBox">
  <view class="tltiBox">
  <!-- <view class="tltiBox">
    <view style="width: 100%; height: {{barHeight}}px; "></view>
    <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
      <view>
@@ -14,7 +14,7 @@
      <view class="navbar-title">{{subtitleName}}</view>
    </view>
  </view>
  </view> -->
  <view class="outsideHeadBox">
pages/bookExhibitionDetails/index.wxss
@@ -140,7 +140,8 @@
}
.outsideHeadBox {
  margin-top: 200rpx;
  margin-top: 20rpx;
}
.bottom-box {
pages/cart/paymentPage/index.js
@@ -5,7 +5,7 @@
import {
  getPublicImage
} from '../../../assets/js/middleGround/tool';
import drawQrcode from './js/weapp.qrcode'
Page({
  /**
@@ -26,13 +26,20 @@
    isPaySuccess: false,
    isPayComplete: false,
    type: '',
    onNorderSaleMethod: ''
    onNorderSaleMethod: '',
    ImmediatelyReceive: ''
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    wx.setNavigationBarTitle({
      title: '提交订单'
    });
    const systInfo = wx.getSystemInfoSync();
    const menu = wx.getMenuButtonBoundingClientRect(); // 胶囊信息
    const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 导航栏高度
@@ -108,8 +115,6 @@
      fields: {
        content: [],
        subtitle: [],
      }
    }
    app.MG.store.getOrderByOrderNum(query).then(res => {
@@ -121,10 +126,12 @@
      console.log(res.payPrice);
      this.setData({
        payPrice: res.payPrice.toFixed(2)
        payPrice: res.payPrice.toFixed(2),
        ImmediatelyReceive: res.payPrice
      })
      console.log(this.data.ImmediatelyReceive);
      res.saleMethodLinks.forEach(item => {
        console.log(item.type, 'item.type');
        // console.log(item.type, 'item.type');
        const type = item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
        item.type = type; // 将type设置为item对象的属性,而不是使用setData
@@ -241,4 +248,19 @@
    // 返回
    wx.navigateBack()
  },
  onReceive() {
    let query = {
      orderNum: this.data.orderGoods
    }
    app.MG.store.confirmOrder(query).then(res => {
      Toast({
        context: this,
        selector: '#t-toast',
        message: '领取成功',
        theme: 'success',
        direction: 'column',
      });
      wx.navigateBack()
    })
  }
})
pages/cart/paymentPage/index.json
@@ -5,6 +5,5 @@
    "t-button": "tdesign-miniprogram/button/button",
    "t-dialog": "tdesign-miniprogram/dialog/dialog",
    "t-toast": "tdesign-miniprogram/toast/toast"
  },
  "navigationStyle": "custom"
  }
}
pages/cart/paymentPage/index.wxml
@@ -4,7 +4,7 @@
<view hidden="{{hidden}}">
  <view class="titleBox">
  <!-- <view class="titleBox">
    <view style="width: 100%; height: {{barHeight}}px; "></view>
    <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
      <view>
@@ -12,7 +12,7 @@
      </view>
      <view class="navbar-title">提交订单</view>
    </view>
  </view>
  </view> -->
  <view class="paymentPageBox">
    <view class="content">
@@ -25,50 +25,22 @@
          </view>
          <view class="cartListContent">
            <view class="cartListDetails">
              <!-- <view class="labelBox">
              <view class="eBook" wx:if="{{item.type == 'product'}}">电子书</view>
              <view wx:if="{{item.type == 'item'}}" class="cloudLearning">云学习</view>
            </view> -->
              <!-- <view class="boosName">
              {{item.orderSaleMethod.product.name}}
            </view> -->
              <view wx:if="{{item.type == 'product'}}" style="width: 386rpx;">
                <!-- <view>
                <text class="eBook">电子书</text> <text class="boosName">{{item.orderSaleMethod.product.name}}</text>
              </view> -->
                <view class="boosName">
                  <text class="eBook">电子书</text>
                  <text> {{item.orderSaleMethod.product.name}}</text>
                </view>
              </view>
              <view wx:if="{{item.type == 'item'}}" style="width: 386rpx;">
                <!--
              <view>
                <text class="cloudLearning">云学习</text> <text class="boosName">{{item.orderSaleMethod.product.name}}</text>
              </view> -->
                <view class="boosName">
                  <text class="cloudLearning">云学习</text>
                  <text> {{item.orderSaleMethod.product.name}}</text>
                </view>
              </view>
            </view>
            <view class="textBox" wx:if="{{item.type == 'product'}}">图书服务-电子书</view>
            <view class="textBox" wx:if="{{item.type == 'item'}}">图书服务-云学习</view>
            <view class="priceBox">¥{{item.payPrice}}</view>
            <view class="priceBox">¥{{payPrice}}</view>
          </view>
        </view>
      </view>
@@ -88,7 +60,9 @@
    <view class="paymentBox">
      <view class="residue">待支付:<text class="residueTextBox">¥{{payPrice}}</text></view>
      <view>
        <t-button class="buttonBox" shape="round" catch:tap="confirmOrderGet">微信支付</t-button>
        <t-button wx:if="{{ImmediatelyReceive === 0}}" class="buttonBox" shape="round" catch:tap="onReceive">立即领取</t-button>
        <t-button wx:else class="buttonBox" shape="round" catch:tap="confirmOrderGet">微信支付</t-button>
      </view>
    </view>
  </view>
pages/cart/paymentPage/index.wxss
@@ -5,7 +5,6 @@
  background-color: #fff;
  display: flex;
  align-items: center;
}
.navbar-title {
@@ -20,12 +19,10 @@
.content {
  width: 100%;
  background-color: #F2F3F8;
  padding: 40rpx 0;
  padding-top: 1rpx;
  margin-top: 110rpx;
  /* padding-top: 1rpx; */
  /* margin-top: 110rpx; */
}
.shoppingCartList {
@@ -47,12 +44,11 @@
  height: 210rpx;
}
.cartListContent {
  /* margin: 0 auto; */
}
.cartList {
  display: flex;
  width: 750rpx;
}
.cartListContent {
@@ -60,6 +56,15 @@
}
.cartListDetails {
  /* margin-bottom: 50rpx;
  font-family: PingFang SC, PingFang SC;
  font-weight: bold;
  font-size: 29rpx;
  color: #333333;
  display: flex;
  flex-direction: row;
  padding: 0 10rpx; */
  /* margin-right: 500rpx; */
  margin-bottom: 50rpx;
  font-family: PingFang SC, PingFang SC;
  font-weight: bold;
@@ -67,8 +72,6 @@
  color: #333333;
  display: flex;
  flex-direction: row;
  padding: 0 10rpx;
}
.textBox {
@@ -179,7 +182,11 @@
}
.paymentPageBox {
  margin-top: 165rpx;
  /* margin-top: 165rpx; */
  /* position: absolute;
  top: 150rpx; */
}
page {
@@ -194,6 +201,7 @@
  width: 100%;
}
.eBook {
  width: 85rpx;
@@ -237,7 +245,7 @@
  font-family: PingFang SC, PingFang SC;
  font-weight: bold;
  font-size: 29rpx;
  margin: 0 10rpx;
  /* margin: 0 10rpx; */
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
pages/cart/paymentPage/js/weapp.qrcode.js
File was deleted
pages/retrievalPage/index.js
@@ -176,6 +176,7 @@
  retrievalPageGet() {
    let fields = {
      liveTime: [],
      lecturer: [],
@@ -576,6 +577,10 @@
    });
  },
  onSearchSubmit() {
    this.setData({
      loading: true,
      hidden: true,
    })
    console.log(this.data.searchVal);
    this.retrievalPageGet()
    this.bibliographyGet()
pages/retrievalPage/index.wxss
@@ -386,8 +386,6 @@
.t-tabs .t-tabs__item--active {
  /* min-width: 210rpx; */
  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: 83% center;
  background-size: 45% 70%;
@@ -398,4 +396,9 @@
  background-color: #FF6C00 !important;
  -webkit-transform: translateX(39px);
  transform: translateX(39px);
  /* height: var(--td-tab-track-thickness, 0rpx) !important; */
}
.t-overlay.overlay--t-overlay {
  z-index: -9999 !important;
}