Merge refs/remotes/origin/master into refs/heads/master

litian

2024-04-12 03f061e0801130aa5b3aa2ab193f71ce132164d1

Merge refs/remotes/origin/master into refs/heads/master

 packageBookService/pages/bookServices/detail/components/note/note.json

@@ -11,6 +11,7 @@
    "t-loading": "tdesign-miniprogram/loading/loading",
    "t-popup": "tdesign-miniprogram/popup/popup",
    "t-icon": "tdesign-miniprogram/icon/icon",
    "t-empty": "tdesign-miniprogram/empty/empty"
    "t-empty": "tdesign-miniprogram/empty/empty",
    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
  }
}

 packageBookService/pages/bookServices/detail/components/note/note.wxml

@@ -64,7 +64,12 @@
  </view>
</view>
<view class="loading-box" wx:if="{{loading}}">
  <t-loading loading="{{loading}}" size="60rpx"></t-loading>
  <t-skeleton
    row-col="{{[1,1,1,1,1,1]}}"
    theme="paragraph"
    animation="gradient"
    loading="{{loading}}"
  ></t-skeleton>
</view>

<!-- 记笔记弹窗 -->

 packageBookService/pages/bookServices/detail/components/note/note.wxss

@@ -123,9 +123,6 @@
.loading-box {
  width: 100%;
  min-height: 550rpx;
  display: flex;
  align-items: center;
  justify-content: center;
}

.content {

 packageBookService/pages/bookServices/detail/components/relatedBooks/index.json

@@ -2,6 +2,7 @@
  "component": true,
  "usingComponents": {
    "t-empty": "tdesign-miniprogram/empty/empty",
    "t-loading": "tdesign-miniprogram/loading/loading"
    "t-loading": "tdesign-miniprogram/loading/loading",
    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
  }
}

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

@@ -19,11 +19,11 @@
    <t-empty icon="folder-open" description="暂无数据" />
  </view>
  <view class="loading-box" wx:if="{{relatedBookLoading}}">
    <t-loading
      theme="circular"
      size="60rpx"
      class="loading"
      loading="{{relatedBookLoading}}"
    />
    <t-skeleton
    row-col="{{[1,1,1,1,1,1]}}"
    theme="paragraph"
    animation="gradient"
    loading="{{relatedBookLoading}}"
  ></t-skeleton>
  </view>
</view>

 packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxss

@@ -50,7 +50,8 @@
}

.loading-box {
  margin: 100rpx auto;
  width: 100%;
  height: min-content;
}

.noData {

 packageBookService/pages/bookServices/detail/components/testResource/testResource.js

@@ -32,6 +32,16 @@
   * 组件的方法列表
   */
  methods: {
    testBtn() {
      this.setData({
        radioItem: 'test'
      })
    },
    mockBtn() {
      this.setData({
        radioItem: 'mock'
      })
    },
    async goTest(e) {
      const value = e.currentTarget.dataset.value;
      const token = wx.getStorageSync("jsek-token");
@@ -110,8 +120,7 @@
      this.setData({
        radioItem: e.detail.value,
      });
      if (e.detail.value == "mock") {
      }
      if (e.detail.value == "mock") {}
    },
    async getMockId() {
      wx.showLoading({
@@ -160,4 +169,4 @@
      });
    },
  },
});
});

 packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml

@@ -1,12 +1,38 @@
<!--pages/bookServices/detail/components/testResource/testResource.wxml-->
<view class="test-resource">
  <view class="top-btn">
    <t-radio-group
    <view class="test-radio">
      <view
        class="test-btn card {{radioItem == 'test' ? 'card--active' : ''}}"
        bind:tap="testBtn"
      >
        <view class="image-box">
          <image
            class="test-icon"
            src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"
            mode="aspectFit"
          ></image>
        </view>
        <view class="btn-content-text">练习</view>
      </view>
      <view
        class="test-btn card {{radioItem == 'mock' ? 'card--active' : ''}}"
        bind:tap="mockBtn"
      >
        <view class="image-box">
          <image
            src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
          ></image>
        </view>
        <view class="btn-content-text">组卷</view>
      </view>
    </view>
    <!-- <t-radio-group
      class="test-radio"
      t-class="horizontal-box"
      value="{{radioItem}}"
      bind:change="onRadioChange"
      style="margin: 0 10rpx 0 0"
      style="margin: 0"
    >
      <view class="card {{radioItem == 'test' ? 'card--active' : ''}}">
        <t-radio value="test" icon="none" borderless style="height: 80rpx">
@@ -20,7 +46,6 @@
          </view>
        </t-radio>
      </view>
      <!-- 断开 -->
      <view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
        <t-radio value="mock" icon="none" borderless style="height: 80rpx">
          <view class="radio-content" slot="content">
@@ -33,46 +58,37 @@
          </view>
        </t-radio>
      </view>
      <!-- 断开 -->
      <!-- <view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
        <t-radio value="mock" icon="none" borderless style="height: 80rpx">
          <view class="radio-content" slot="content">
            <image
              src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
            ></image>
            <text style="color: {{radioItem == 'mock' ? '#fff':'#ff6c00'}};"
              >组卷</text
            >
          </view>
        </t-radio>
      </view> -->
    </t-radio-group>
    <t-button
      class="error-btn"
      theme="default"
      size="medium"
      style="padding: 0 12rpx"
      bind:tap="goMycollect"
      data-answerType="errorQuestion"
    >
      <view slot="content" class="btn-content">
        <image src="/static/images/bookService/detail/cuoti.png"></image>
        <text class="primary-color">我的错题</text>
      </view>
    </t-button>
    <t-button
      class="collect-btn"
      theme="default"
      size="medium"
      style="padding: 0 12rpx"
      bind:tap="goMycollect"
      data-answerType="collectQuestion"
    >
      <view slot="content" class="btn-content">
        <image src="/static/images/bookService/detail/wodeshoucang.png"></image>
        <text class="primary-color"> 我的收藏</text>
      </view>
    </t-button>
    </t-radio-group> -->
    <view class="btn-box">
      <t-button
        class="error-btn"
        theme="default"
        size="medium"
        style="padding: 0 12rpx"
        bind:tap="goMycollect"
        data-answerType="errorQuestion"
      >
        <view slot="content" class="btn-content">
          <image src="/static/images/bookService/detail/cuoti.png"></image>
          <text class="primary-color">我的错题</text>
        </view>
      </t-button>
      <t-button
        class="collect-btn"
        theme="default"
        size="medium"
        style="padding: 0 12rpx"
        bind:tap="goMycollect"
        data-answerType="collectQuestion"
      >
        <view slot="content" class="btn-content">
          <image
            src="/static/images/bookService/detail/wodeshoucang.png"
          ></image>
          <text class="primary-color"> 我的收藏</text>
        </view>
      </t-button>
    </view>
  </view>
  <!-- 练习列表 -->
  <view

 packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss

@@ -50,10 +50,46 @@
  align-items: center;
}

.image-box {
  display: flex;
  align-items: center;
  width: 32rpx;
  height: 32rpx;
}

.image-box image {
  height: 32rpx;
}

.top-btn image {
  margin-right: 4rpx;
}

.btn-box image {
  width: 36rpx;
  height: 36rpx;
}

.test-btn {
  box-sizing: border-box;
  display: flex;
  justify-content: center;
  align-items: center;
  width: 176rpx;
  height: 82rpx;
}

.test-btn:last-child {
  margin-left: 20rpx;
}

.btn-content-text {
  height: min-content;
}

.btn-box {
  display: flex;
  width: 50%;
}

.practice-btn {
@@ -103,8 +139,8 @@
}

.card--active {
  --td-radio-bg-color: #ff6c00;
  --td-radio-content-color: #fff;
  background-color: #ff6c00;
  color: #fff;
}


@@ -134,8 +170,9 @@
}

.test-radio {
  --td-radio-content-font-size: 28rpx;
  --td-radio-vertical-padding: 0
  width: 49%;
  display: flex;
  justify-content: space-between;
}

.radio-content {

 packageBookService/pages/bookServices/detail/index.js

@@ -18,6 +18,7 @@
      name: "",
    },
    bookDetail: {},
    bookClass: [],
    bookItemDetail: {},
    link: {
      jd: "",
@@ -376,13 +377,15 @@
      }
      this.getSubTtem();
      // 获取图书分类
      let className = "";
      if (res.datas.bookClassification) {
        const bookClassification = JSON.parse(res.datas.bookClassification);
        if (Array.isArray(bookClassification) && bookClassification.length) {
          const iconType = bookClassification[0][0];
          const classType = bookClassification[0][1];
          className = await this.getBookClass(iconType, classType);
          for (let index = 0; index < bookClassification.length; index++) {
            const element = bookClassification[index];
            const iconType = element[0];
            const classType = element[1];
            await this.getBookClass(iconType, classType);
          }
        }
      }

@@ -415,7 +418,6 @@
        "bookDetail.publicationDate": this.formatDate(
          this.data.bookDetail.publicationDate
        ),
        "bookDetail.class": className,
        "bookDetail.price": this.numFormat(this.data.bookDetail.price),
        "bookDetail.oldPrice": this.numFormat(this.data.bookDetail.oldPrice),
        "bookDetail.paperPrice": this.numFormat(
@@ -423,7 +425,7 @@
        ),
        pageLoading: false,
      });
      console.log("图书信息", this.data.bookDetail);
      console.log("图书信息", this.data.bookClass);
    });
  },
  //请求子商品的文件
@@ -551,13 +553,19 @@
        if (item.value == iconType) {
          item.child.forEach((citem) => {
            if (citem.value == classType) {
              name = citem.name;
              const flag = this.data.bookClass.findIndex((ditem) => ditem == citem.name)
              if (flag == -1) {
                let list = this.data.bookClass
                list.push(citem.name)
                this.setData({
                  bookClass: list
                })
              }
            }
          });
        }
      });
    });
    return name;
  },
  // 收藏
  setCollect() {

 packageBookService/pages/bookServices/detail/index.json

@@ -18,7 +18,8 @@
    "t-dialog": "tdesign-miniprogram/dialog/dialog",
    "t-toast": "tdesign-miniprogram/toast/toast",
    "t-empty": "tdesign-miniprogram/empty/empty",
    "t-fab": "tdesign-miniprogram/fab/fab"
    "t-fab": "tdesign-miniprogram/fab/fab",
    "t-skeleton": "tdesign-miniprogram/skeleton/skeleton"
  },
  "navigationStyle": "custom",
  "onReachBottomDistance": 200,

 packageBookService/pages/bookServices/detail/index.skeleton.wxml

@@ -98,7 +98,7 @@
        </view>
        <movable-area class="movable-area">
          <view class="book-resource">
            <view class="t-tabs tabs--t-tabs t-tabs--top tabs--t-tabs--top tab-class custom-tabs" style="true">
            <view class="t-tabs tabs--t-tabs t-tabs--top tabs--t-tabs--top tab-class custom-tabs" >
              <view class="t-sticky sticky--t-sticky tabs--t-tabs__sticky tabs--t-tabs__sticky--top" style="z-index: 1 ;">
                <view class="t-sticky__content sticky--t-sticky__content" style="z-index: 1 ;">
                  <view class="t-tabs__wrapper tabs--t-tabs__wrapper t-tabs__wrapper--line tabs--t-tabs__wrapper--line">
@@ -106,7 +106,7 @@
                      <view class="t-tabs__nav tabs--t-tabs__nav t-tabs__nav--top tabs--t-tabs__nav--top" style="scroll-snap-align: none">
                        <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top t-tabs__item--active tabs--t-tabs__item--active sk-image" data-index="0">
                          <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line t-tabs__item-inner--active tabs--t-tabs__item-inner--active sk-transparent">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" style="width: ; height: ">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" >
                              <view class="t-icon--image icon--t-icon--image">
                                <image class="t-icon__image icon--t-icon__image sk-image" mode="aspectFit"></image>
                              </view>
@@ -115,7 +115,7 @@
                        </view>
                        <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top" data-index="1">
                          <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line sk-transparent">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" style="width: ; height: ">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" >
                              <view class="t-icon--image icon--t-icon--image">
                                <image class="t-icon__image icon--t-icon__image sk-image" mode="aspectFit"></image>
                              </view>
@@ -124,7 +124,7 @@
                        </view>
                        <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top" data-index="2">
                          <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line sk-transparent">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" style="width: ; height: ">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" >
                              <view class="t-icon--image icon--t-icon--image">
                                <image class="t-icon__image icon--t-icon__image sk-image" mode="aspectFit"></image>
                              </view>
@@ -133,7 +133,7 @@
                        </view>
                        <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top" data-index="3">
                          <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line sk-transparent">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" style="width: ; height: ">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" >
                              <view class="t-icon--image icon--t-icon--image">
                                <image class="t-icon__image icon--t-icon__image sk-image" mode="aspectFit"></image>
                              </view>
@@ -142,7 +142,7 @@
                        </view>
                        <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top" data-index="4">
                          <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line sk-transparent">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" style="width: ; height: ">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" >
                              <view class="t-icon--image icon--t-icon--image">
                                <image class="t-icon__image icon--t-icon__image sk-image" mode="aspectFit"></image>
                              </view>
@@ -151,22 +151,21 @@
                        </view>
                        <view class="t-tabs__item tabs--t-tabs__item t-tabs__item--line tabs--t-tabs__item--line t-tabs__item--evenly tabs--t-tabs__item--evenly t-tabs__item--top tabs--t-tabs__item--top" data-index="5">
                          <view class="t-tabs__item-inner tabs--t-tabs__item-inner t-tabs__item-inner--line tabs--t-tabs__item-inner--line sk-transparent">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" style="width: ; height: ">
                            <view class="t-icon icon--t-icon tabs--t-tabs__icon tabs--undefined" >
                              <view class="t-icon--image icon--t-icon--image">
                                <image class="t-icon__image icon--t-icon__image sk-image" mode="aspectFit"></image>
                              </view>
                            </view>相关图书
                          </view>
                        </view>
                        <view class="t-tabs__track tabs--t-tabs__track t-tabs__track--top tabs--t-tabs__track--top" style=" -webkit-transform: translateX(24.5px);transform: translateX(24.5px);"></view>
                      </view>
                    </scroll-view>
                  </view>
                </view>
              </view>
              <view class="t-tabs__content tabs--t-tabs__content">
                <view class="t-tabs__content-inner tabs--t-tabs__content-inner custom-panel" style="true">
                  <view class="t-tab-panel tab-panel--t-tab-panel t-is-active tab-panel--t-is-active" style="true" id="4e5240c1--t_tabs_2_panel_0">
                <view class="t-tabs__content-inner tabs--t-tabs__content-inner custom-panel" >
                  <view class="t-tab-panel tab-panel--t-tab-panel t-is-active tab-panel--t-is-active"  id="4e5240c1--t_tabs_2_panel_0">
                    <view is="packageBookService/pages/bookServices/detail/components/brief/index">
                      <view class="brief-index--message">
                        <view class="brief-index--basic">
@@ -186,13 +185,13 @@
                            <view class="brief-index--title-name sk-transparent sk-text-14-2857-323 sk-text">作者简介</view>
                          </view>
                        </view>
                        <rich-text nodes="" style="font-size: 14px;color: #333;line-height: 24px;text-align: justify;"></rich-text>
                        <rich-text nodes="" ></rich-text>
                      </view>
                    </view>
                  </view>
                  <view class="t-tab-panel tab-panel--t-tab-panel" style="height: 0" id="4e90759b--t_tabs_2_panel_1"></view>
                  <view class="t-tab-panel tab-panel--t-tab-panel" style="height: 0" id="8ad82e81--t_tabs_2_panel_2"></view>
                  <view class="t-tab-panel tab-panel--t-tab-panel" style="height: 0" id="93887d3b--t_tabs_2_panel_3">
                  <view class="t-tab-panel tab-panel--t-tab-panel"  id="4e90759b--t_tabs_2_panel_1"></view>
                  <view class="t-tab-panel tab-panel--t-tab-panel"  id="8ad82e81--t_tabs_2_panel_2"></view>
                  <view class="t-tab-panel tab-panel--t-tab-panel"  id="93887d3b--t_tabs_2_panel_3">
                    <view>
                      <view is="packageBookService/pages/bookServices/detail/components/testResource/testResource" id="test-resource">
                        <view class="testResource--test-resource">
@@ -285,19 +284,19 @@
      <view class="box-bottom">
        <view class="bottom-btn">
          <view>
            <image class="t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="9796bcfb--image" mode="scaleToFill" style="true"></image>
            <image class="t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="9796bcfb--image" mode="scaleToFill" ></image>
          </view>
          <view class="btn-text sk-transparent sk-text-14-2857-103 sk-text">电子样书申请</view>
        </view>
        <view class="bottom-btn">
          <view>
            <image class="t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="e67eb843--image" mode="scaleToFill" style="true"></image>
            <image class="t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="e67eb843--image" mode="scaleToFill" ></image>
          </view>
          <view class="btn-text sk-transparent sk-text-14-2857-823 sk-text">纸质样书申请</view>
        </view>
        <view class="bottom-btn tryRead">
          <view>
            <image class="t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="5cbc8a00--image" mode="scaleToFill" style="true"></image>
            <image class="t-image image--t-image t-image--shape-square image--t-image--shape-square sk-image" id="5cbc8a00--image" mode="scaleToFill" ></image>
          </view>
          <view class="btn-text sk-transparent sk-text-14-2857-17 sk-text">试读</view>
        </view>

 packageBookService/pages/bookServices/detail/index.wxml

@@ -1,7 +1,7 @@
<!--pages/bookServices/detail/index.wxml-->
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{pageLoading}}" />

<!-- pageLoading -->
<!--导航区域 -->
<view class="page-bookService" wx:if="{{!pageLoading}}">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
@@ -68,27 +68,25 @@
              <view class="li-title">丛书名：</view>
              <view class="li-content">{{bookDetail.seriesName}}</view>
            </view>
            <view class="message-li">
              <view class="li-title" wx:if="{{bookDetail.author}}">作者：</view>
            <view class="message-li" wx:if="{{bookDetail.author}}">
              <view class="li-title">作者：</view>
              <view class="li-content">{{bookDetail.author}}</view>
            </view>
            <view class="message-li" wx:if="{{bookDetail.isbn}}">
              <view class="li-title">ISBN：</view>
              <view class="li-content">{{bookDetail.isbn}}</view>
            </view>
            <view class="message-li">
              <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
                >出版时间：</view
              >
            <view class="message-li" wx:if="{{bookDetail.publicationDate}}">
              <view class="li-title">出版时间：</view>
              <view class="li-content">{{bookDetail.publicationDate}}</view>
            </view>
            <view
              class="message-li"
              wx:if="{{bookDetail.class}}"
              wx:if="{{bookClass.length}}"
              style="height: 80rpx"
            >
              <view class="li-title">图书分类：</view>
              <view class="class-name showTow">{{bookDetail.class}}</view>
              <view class="class-name showTow">{{bookClass}}</view>
            </view>
          </view>
          <image
@@ -224,12 +222,20 @@
                wx:if="{{teach.length}}"
              ></tree>
            </view>
            <t-loading
            <!-- <t-loading
              theme="circular"
              size="60rpx"
              class="loading"
              loading="{{loading }}"
            />
            /> -->
            <view wx:if="{{loading}}" style="width: 100%; height: min-content">
              <t-skeleton
                row-col="{{[1,1,2,1,1,2]}}"
                theme="paragraph"
                animation="gradient"
                loading="{{loading}}"
              ></t-skeleton>
            </view>
            <view wx:if="{{noResources}}" class="noData">
              <t-empty icon="folder-open" description="暂无数据" />
            </view>

 packageBookService/pages/bookServices/examination/examination.skeleton.wxml

@@ -26,7 +26,7 @@
      </view>
      <view class="navbar-title sk-transparent sk-text-14-2857-257 sk-text" style="color: #000;">第三章在线测试</view>
    </view>
    <view class="page-content" style="background-color:">
    <view class="page-content" >
      <view is="packageBookService/pages/bookServices/examination/questionSchedule/index" id="countDownRef">
        <view class="questionSchedule-index--schedule" id="f88d4fe7--schedule" style="background-color:#fff">
          <view class="questionSchedule-index--schedule-top">
@@ -40,10 +40,10 @@
            </view>
          </view>
          <view class="questionSchedule-index--schedule-progress">
            <view class="t-progress progress--t-progress " style="true">
            <view class="t-progress progress--t-progress ">
              <view class="t-progress--thin progress--t-progress--thin t-progress--status-- progress--t-progress--status-- ">
                <view class="t-progress__bar progress--t-progress__bar" style="height: px;border-radius: px;background-color: ">
                  <view class="t-progress__inner progress--t-progress__inner " style="background: #ff6c00; width: 0%"></view>
                <view class="t-progress__bar progress--t-progress__bar" >
                  <view ></view>
                </view>
              </view>
            </view>
@@ -63,7 +63,7 @@
                <view class="questionList-index--title-content sk-transparent sk-text-14-2857-70 sk-text">本题正确答案是对</view>
              </view>
              <view class="questionList-index--question-answer">
                <view class="t-radio-group radio-group--t-radio-group questionList-index--radio-group " style="true">
                <view class="t-radio-group radio-group--t-radio-group questionList-index--radio-group " >
                  <view>
                    <view class="t-radio radio--t-radio t-radio--right radio--t-radio--right t-radio--block radio--t-radio--block  " style="background-color: #fff;" tabindex="0">
                      <view class="t-radio__content radio--t-radio__content" data-target="text">
@@ -93,7 +93,7 @@
        </view>
      </view>
    </view>
    <view class="page-bottom" style="background-color:">
    <view class="page-bottom" >
      <view is="packageBookService/pages/bookServices/examination/questionOptions/index" id="question-options">
        <view class="questionOptions-index--page-bottom" style="color: #000; background-color:#fff">
          <view class="questionOptions-index--li-option sk-transparent" style="color: #000;">

 packageBookService/pages/bookServices/examination/examination.wxml

@@ -1,7 +1,7 @@
<!--pages/examination/examination.wxml-->

<import src="examination.skeleton.wxml"/>
<template is="skeleton" wx:if="{{loading}}" />
<import src="examination.skeleton.wxml" />
<template is="skeleton" wx:if="{{true}}" />

<!--导航区域 -->
<view

 packageBookService/pages/bookServices/list/index.skeleton.wxml

@@ -40,19 +40,19 @@
            <view class="t-dropdown-menu menu--t-dropdown-menu sk-pseudo sk-pseudo-circle" id="160b824d--t-bar" style="width: 624px;">
              <view class="t-dropdown-menu__item menu--t-dropdown-menu__item sk-button" data-index="0">
                <view class="t-dropdown-menu__title menu--t-dropdown-menu__title sk-transparent sk-text-14-2857-964 sk-text">公共基础类</view>
                <view class="t-icon icon--t-icon  menu--t-dropdown-menu__icon menu--t-dropdown-menu__icon-- " style="true">
                <view class="t-icon icon--t-icon  menu--t-dropdown-menu__icon menu--t-dropdown-menu__icon-- " >
                  <label class="t-icon-caret-down-small icon--t-icon-caret-down-small t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
                </view>
              </view>
              <view class="t-dropdown-menu__item menu--t-dropdown-menu__item sk-button" data-index="1">
                <view class="t-dropdown-menu__title menu--t-dropdown-menu__title sk-transparent sk-text-14-2857-856 sk-text">二级</view>
                <view class="t-icon icon--t-icon  menu--t-dropdown-menu__icon menu--t-dropdown-menu__icon-- " style="true">
                <view class="t-icon icon--t-icon  menu--t-dropdown-menu__icon menu--t-dropdown-menu__icon-- " >
                  <label class="t-icon-caret-down-small icon--t-icon-caret-down-small t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
                </view>
              </view>
              <view class="t-dropdown-menu__item menu--t-dropdown-menu__item sk-button" data-index="2">
                <view class="t-dropdown-menu__title menu--t-dropdown-menu__title sk-transparent sk-text-14-2857-539 sk-text">重点项目</view>
                <view class="t-icon icon--t-icon  menu--t-dropdown-menu__icon menu--t-dropdown-menu__icon-- " style="true">
                <view class="t-icon icon--t-icon  menu--t-dropdown-menu__icon menu--t-dropdown-menu__icon-- " >
                  <label class="t-icon-caret-down-small icon--t-icon-caret-down-small t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"></label>
                </view>
              </view>
@@ -63,8 +63,8 @@
        <scroll-view class="list-container" lower-threshold="200" refresher-default-style="none" refresher-enabled="true" refresher-threshold="80" scroll-into-view="true" scroll-y="true">
          <view class="refresh-container">
            <view class="loading">
              <view class="wrapper  t-loading loading--t-loading t-loading--horizontal loading--t-loading--horizontal" style="true">
                <view class=" t-loading__spinner loading--t-loading__spinner t-loading__spinner--circular loading--t-loading__spinner--circular" style="width: 20px; height: 20px;   animation-duration: 0.8s; animation-play-state: running;">
              <view class="wrapper  t-loading loading--t-loading t-loading--horizontal loading--t-loading--horizontal">
                <view class=" t-loading__spinner loading--t-loading__spinner t-loading__spinner--circular loading--t-loading__spinner--circular" >
                  <view class="t-loading__circular loading--t-loading__circular sk-image"></view>
                </view>
                <view class="t-loading__text loading--t-loading__text t-loading__text--horizontal loading--t-loading__text--horizontal sk-transparent sk-text-20-0000-74 sk-text">正在刷新...</view>

 packageDomain/pages/resourceDetails/myAudio/index.js

@@ -218,7 +218,7 @@
  },
  showDialog(e) {
    this.setData({
      submitTitle: this.data.bookName,
      submitTitle: this.data.titleName,
      dialogKey: true,
      textvalue: ''
    });

 packageDomain/pages/resourceDetails/myAudio/index.wxml

@@ -12,7 +12,7 @@
  </view>

  <view class="audioPlayerBox">
    <view class="audioBackground" style="background-image: url('http://182.92.203.7:3007/jsek/website/image/video-bg.png');">
    <view class="audioBackground" style="background-image: url('https://jsek.bnuic.com/website/image/video-bg.png');">
      <image src="/static/images/resourceDetailsMyAudio/cd.png" alt="" />
    </view>
    <!-- 视频播放的按钮 -->

 packageDomain/pages/resourceDetails/myAudio/index.wxss

@@ -23,7 +23,6 @@
  border-bottom: 1px #f4f4f4 solid;
  padding-bottom: 20rpx;
  font-weight: bold;

}

.contentBox {
@@ -43,16 +42,14 @@

.custom-panel {
  width: 750rpx;

}

.contentBox .takeNotes {

  position: absolute;
  top: 5rpx;
  top: 0rpx;
  right: 0;
  width: 350rpx;
  border-bottom: 1px solid #f4f4f4;
  width: 353rpx;
  border-bottom: 1rpx solid #e7e7e7;
}

.takeNotes image {
@@ -119,7 +116,6 @@
.buttonBox {
  display: flex;
  justify-content: center;

}

.detailsName {
@@ -271,7 +267,7 @@

.audioBackground {
  flex: 1;
  background-image: url('http://182.92.203.7:3007/jsek/website/image/video-bg.png');
  background-image: url('https://jsek.bnuic.com/website/image/video-bg.png');
  background-repeat: no-repeat;
  background-position: center center;
  background-size: 100% 100%;

 packageDomain/pages/resourceDetails/myVideo/index.js

@@ -10,7 +10,7 @@
    noteList: [],
    navBarHeight: '',
    barHeight: '',
    flag: false, // 输入框是否显示
    flag: true, // 输入框是否显示
    tabPanelstyle: 'display:flex;justify-content:center;align-items:center;',
    activeValues: [0],
    dialogKey: false,
@@ -179,10 +179,10 @@
  showDialog(e) {

    this.setData({
      submitTitle: this.data.bookName,
      dialogKey: true,
      textvalue: ''

      dialogKey: true,
      textvalue: '',
      submitTitle: this.data.titleName

    });
  },
@@ -337,7 +337,7 @@
  // 标题输入框值
  inputChange(e) {
    this.setData({
      titleName: e.detail.value
      submitTitle: e.detail.value
    })
  },

@@ -347,7 +347,7 @@
        icon: 'error',
        title: '请填写笔记内容',
      })
    } else if (!this.data.titleName) {
    } else if (!this.data.submitTitle) {
      return wx.showToast({
        icon: 'error',
        title: '请填写笔记标题',
@@ -430,11 +430,9 @@
      submitType: "edit",
      textvalue: note.content,
      submitTitle: note.name,

      noteId: note.id,
      dialogKey: true,
    })
    console.log(this.data.submitTitle);
    // this.showDialog()
  },

@@ -519,7 +517,7 @@
      return wx.getUserProfile({
        desc: '用户登录',
        success: (res) => {
          // console.log(res);
          console.log(res);
        }
      })
    }

 packageDomain/pages/resourceDetails/myVideo/index.wxml

@@ -1,8 +1,7 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />

<view hidden="{{hidden}}">

<view wx:if="{{!hidden}}">
  <view style="width: 100%; height: {{barHeight}}px; "></view>
  <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
    <view>
@@ -84,11 +83,11 @@
    <view class="popup">
      <view slot="title">
        <view class="title-text" wx:if="{{!flag}}">
          <text class="note-title">{{titleName}}</text>
          <text class="note-title">{{submitTitle}}</text>
          <t-image src="/static/images/bookService/detail/edit.png" class="edit-icon" bind:tap="changeTitle" data-value="{{true}}"></t-image>
        </view>
        <view wx:else>
          <t-input value="{{titleName}}" style="{{inputStyle}}" data-value="{{false}}" bind:enter="changeTitle" bind:blur="changeTitle" maxlength="{{50}}" bind:change="inputChange"></t-input>
          <t-input value="{{submitTitle}}" style="{{inputStyle}}" data-value="{{false}}" bind:enter="changeTitle" bind:blur="changeTitle" maxlength="{{50}}" bind:change="inputChange"></t-input>
        </view>
      </view>


 packageDomain/pages/resourceDetails/myVideo/index.wxss

@@ -73,13 +73,11 @@
}

.contentBox .takeNotes {

  position: absolute;
  top: 5rpx;
  top: 0rpx;
  right: 0;
  width: 350rpx;
  border-bottom: 1px solid #f4f4f4;

  width: 353rpx;
  border-bottom: 1rpx solid #e7e7e7;
}

.takeNotes image {

 packagePersonal/pages/aboutUs/index.wxml

@@ -21,6 +21,6 @@
    </view>
  </view>
  <view wx:else class="aboutText" style="margin: 5rpx;">
    <rich-text style="width: 100%;" space="emsp" nodes="{{aboutText}}"></rich-text>
    <rich-text class="richTextBox" style="width: 100%;" space="emsp" nodes="{{aboutText}}" mode="compat"></rich-text>
  </view>
</view>

 packagePersonal/pages/aboutUs/index.wxss

@@ -44,4 +44,42 @@
  position: sticky;
  top: 0px;
  background-color: #fff;
}


.richTextBox {
  line-height: 1.4;
  font-size: 14px;
}

.richTextBox {
  margin: revert;
  padding: revert;
  border: revert;
  font: revert;
  vertical-align: revert;
  color: #000;
}

.richTextBox p {
  display: block;
  text-align: center;
  -webkit-margin-before: 1em;
  margin-block-start: 1em;
  -webkit-margin-after: 1em;
  margin-block-end: 1em;
  -webkit-margin-start: 0;
  margin-inline-start: 0;
  -webkit-margin-end: 0;
  margin-inline-end: 0;
}

.richTextBox td {
  border-bottom: 1px dashed;
  border-right: 1px dashed;
  border-width: 1px !important;
}

.richTextBox table {
  border-width: 2px !important;
}

 pages/bookServices/assort/index.skeleton.wxml

@@ -28,11 +28,11 @@
      </view>
      <view class="page-header">
        <view class="search">
          <view class="t-search search--t-search" style="true">
          <view class="t-search search--t-search" >
            <view
              class="t-search__input-box search--t-search__input-box t-not-focused search--t-not-focused t-search__input-box-- search--t-search__input-box-- t-search__input-box--square search--t-search__input-box--square t-search__input-container"
            >
              <view class="wr icon--wr" style="color: #bbb; font-size: 20px">
              <view class="wr icon--wr" >
                <label
                  class="wr-search icon--wr-search t-icon-base icon--t-icon-base sk-pseudo sk-pseudo-circle"
                ></label>
@@ -52,10 +52,9 @@
      <view class="page-container">
        <view class="side-bar-wrapper">
          <view class="tab-left">
            <view class="t-side-bar bar--t-side-bar" style="true">
            <view class="t-side-bar bar--t-side-bar" >
              <view
                class="t-side-bar-item item--t-side-bar-item t-side-bar-item--active item--t-side-bar-item--active sk-transparent sk-button"
                style="true"
              >
                <view
                  class="t-side-bar-item__prefix item--t-side-bar-item__prefix sk-pseudo sk-pseudo-circle"
@@ -67,37 +66,30 @@
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >职业教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >教师教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >少儿教育</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >考试培训</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >主题出版</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >学术著作</view
              >
              <view
                class="t-side-bar-item item--t-side-bar-item sk-transparent sk-button"
                style="true"
                >大众读物</view
              >
              <view class="t-side-bar__padding bar--t-side-bar__padding"></view>

 pages/cart/index.js

@@ -273,7 +273,6 @@
  },
  // 下拉函数
  onPullDownRefresh() {

    this.setData({
      start: 1,
      checkAll: false,