1

litian

2024-07-08 83b8185caf42a0bb008bb31b8b42a4d825ccbaff

1

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

@@ -1,14 +1,6 @@
<view class="teach-btn" wx:if="{{false}}">
  <t-button
    theme="primary"
    style="width: 120px; height: 36px"
    class="btn-upload"
    wx:if="{{false}}"
  >
    <t-image
      src="/static/images/bookService/detail/upload.png"
      style="margin-top: 20rpx"
    ></t-image>
  <t-button theme="primary" style="width: 120px; height: 36px" class="btn-upload" wx:if="{{false}}">
    <t-image src="/static/images/bookService/detail/upload.png" style="margin-top: 20rpx"></t-image>
    <text>上传资源</text>
  </t-button>
  <t-button theme="primary" style="width: 120px; height: 36px">
@@ -16,59 +8,28 @@
    批量下载
  </t-button>
</view>
<view
  class="applyResult  {{applyState == 'none' ? 'applyNone' : applyState == 'Normal' ? 'applyPass' : applyState == 'WaitAudit' ? 'applying' :applyState == 'Reject' ? 'applyReject' :'' }}"
>
  <view wx:if="{{applyState == 'WaitAudit'}}"
    >资源下载申请正在审核中，请耐心等待！</view
  >
<view class="applyResult  {{applyState == 'none' ? 'applyNone' : applyState == 'Normal' ? 'applyPass' : applyState == 'WaitAudit' ? 'applying' :applyState == 'Reject' ? 'applyReject' :'' }}">
  <view wx:if="{{applyState == 'WaitAudit'}}">资源下载申请正在审核中，请耐心等待！</view>
  <view wx:if="{{applyState == 'Normal'}}">
    <view>
      资源下载申请已通过<text wx:if="{{deadline}}"
        >，有效日期截至：{{ deadline }}</text
      ></view
    >
      资源下载申请已通过<text wx:if="{{deadline}}">，有效日期截至：{{ deadline }}</text></view>
    <view style="display: flex; align-items: center; margin-top: 10rpx">
      <text>下载资源请到PC端京师E课</text> <text bind:tap="copy" class="copy-text">复制</text>
      <text>下载资源请到PC端京师智教</text> <text bind:tap="copy" class="copy-text">复制</text>
    </view>
  </view>
  <view wx:if="{{applyState == 'Reject'}}"
    >资源下载需要申请，请先申请并等待审核通过后方可下载</view
  >
  <view wx:if="{{applyState == 'Reject'}}">资源下载需要申请，请先申请并等待审核通过后方可下载</view>
  <view wx:if="{{applyState == 'none'}}">
    资源下载需要申请，请先申请并等待审核通过后方可下载
  </view>
  <view class="btn-box">
    <t-button
      wx:if="{{applyState == 'Reject'}}"
      bind:tap="checkCause"
      style="height: 50rpx"
      class="rejectBtn"
      bind:tap="showDialog"
      >查看原因</t-button
    >
    <t-button
      wx:if="{{applyState == 'none' || applyState == 'Reject'}}"
      theme="primary"
      bind:tap="applyResource"
      class="applyBtn"
      style="height: 50rpx"
      >申请</t-button
    >
    <t-button wx:if="{{applyState == 'Reject'}}" bind:tap="checkCause" style="height: 50rpx" class="rejectBtn" bind:tap="showDialog">查看原因</t-button>
    <t-button wx:if="{{applyState == 'none' || applyState == 'Reject'}}" theme="primary" bind:tap="applyResource" class="applyBtn" style="height: 50rpx">申请</t-button>
  </view>
</view>
<!-- 未通过原因 -->
<t-dialog
  visible="{{showRejectDialog}}"
  title="提示"
  confirm-btn="{{ confirmBtn }}"
  bind:confirm="closeDialog"
  class="notPassed"
>
<t-dialog visible="{{showRejectDialog}}" title="提示" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog" class="notPassed">
  <view slot="content">
    <text class="cause-title"
      >资源下载申请未通过，解决问题后可点击“申请”按钮重新提交申请</text
    >
    <text class="cause-title">资源下载申请未通过，解决问题后可点击“申请”按钮重新提交申请</text>
    <view class="cause-content">原因:{{ rejectCause || '-'}}</view>
  </view>
</t-dialog>
</t-dialog>

 packageBookService/pages/bookServices/detail/index.js

@@ -2211,7 +2211,10 @@
            });
            return false;
          } else if (isApply.state == 'Normal') {
            console.log(isApply.state, "isApply.state")
            const flag = new Date(isApply.feedBack.endDate + '23:59:59').getTime() > new Date().getTime()
            console.log(isApply.feedBack.endDate, new Date()
              'ooo')
            if (flag) {
              wx.showToast({
                title: "该书已申请！",

 packageBookService/pages/components/webView/index.json

@@ -1,5 +1,5 @@
{
  "navigationBarTitleText": "京师E课",
  "navigationBarTitleText": "京师智教",
  "usingComponents": {
    "t-loading": "tdesign-miniprogram/loading/loading"
  }

 pages/home/home.wxml

@@ -1,7 +1,7 @@
<view class="container">
  <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['下拉刷新', '松手刷新', '正在刷新', '刷新完成']}}" bind:refresh="onPullDownRefresh" wx:if="{{!loading}}" bind:scroll="onScroll">
    <view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
      <text class="text">京师E课</text>
      <text class="text">京师智教</text>
    </view>
    <view class="home-page-header">
      <view class="bg">

 pages/retrievalPage/index.wxml

@@ -92,7 +92,6 @@
        </scroll-view>
      </t-tab-panel>
      <t-tab-panel label="专题({{seminarTotal}})" value="3">

        <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
          <view class="listBox">
            <view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox" data-item="{{item}}" bind:tap="underConstruction">
@@ -114,7 +113,6 @@
              </view>
            </view>
          </view>

          <view wx:if="{{seminarData.length != 0}}" class="bottom-box">
            <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
            <text wx:if="{{isMore == false}}">没有更多了</text>