问题修改

litian

2024-03-26 10db09788d74b441a2efd85f5d4614e944b07bb3

问题修改

 custom-tab-bar/index.wxml

@@ -10,8 +10,8 @@
<view class="tabBarBox">
  <view class="tabItem" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="changeTab" data-num="{{index}}">
    <view class="custom-tab-bar-wrapper">
      <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="aspectFill" width="22" height="22" />
      <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="aspectFill" width="22" height="22" />
      <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="aspectFit" width="22" height="22" />
      <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="aspectFit" width="22" height="22" />
      <view class="text {{active == index ? 'activeText' : ''}}">{{ item.text }}</view>
    </view>
  </view>

 custom-tab-bar/index.wxss

@@ -11,18 +11,18 @@

.tabBarBox {
  display: flex;
  padding-bottom: 50rpx;
  padding-bottom: env(safe-area-inset-bottom);
  background-color: #fff;
  /* opacity: 1; */
}

.tabItem {
  flex: 1;
  height: var(--td-tab-bar-height, 80rpx);
  height: var(--td-tab-bar-height, 88rpx);
  box-sizing: border-box;
  user-select: none;
  position: relative;
  margin-bottom: 26rpx;
  margin-bottom: 24rpx;
  background-color: var(--td-tab-bar-bg-color, var(--td-bg-color-container, var(--td-font-white-1, #ffffff)));
  padding: 0 24rpx;
  padding-top: 20rpx;

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

@@ -70,7 +70,7 @@
          }
        })
      }
      this.closeDialog()
      
      let content = {
        source: this.data.ratevalue,
        phone: this.data.inputvalue,
@@ -92,6 +92,7 @@
          icon: 'success',
          duration: 2000
        })
        this.closeDialog()
      })
    },
    // 确定

 packageBookService/pages/bookServices/detail/index.js

@@ -402,7 +402,6 @@
            });
          }
        }
        console.log(this.data.fileInfo, 456)
        this.setData({
          selectedIds: this.data.bookDetail.defaultSaleMethodId,
          bookBuy: this.data.bookDetail.purchasedSaleMethodIdList.indexOf(this.data.bookDetail.defaultSaleMethodId) > -1

 packageBookService/pages/bookServices/detail/index.json

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

 packageBookService/pages/bookServices/detail/index.wxml

@@ -4,55 +4,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">
        <view class="detail-left">
          <view class="book-img">
            <image
              loading=""
              src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
              mode="aspectFill"
              aria-label="{{bookDetail.name}}"
            />
            <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" 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>
@@ -74,24 +49,15 @@
              <view class="li-content">{{bookDetail.isbn}}</view>
            </view>
            <view class="message-li">
              <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
                >出版时间：</view
              >
              <view class="li-title" wx:if="{{bookDetail.publicationDate}}">出版时间：</view>
              <view class="li-content">{{bookDetail.publicationDate}}</view>
            </view>
            <view
              class="message-li"
              wx:if="{{bookDetail.class}}"
              style="height: 80rpx"
            >
            <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
              <view class="li-title">图书分类：</view>
              <view class="class-name showTow">{{bookDetail.class}}</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>
      <!-- 销售信息 -->
@@ -100,17 +66,12 @@
          <!-- 电子书售价 -->
          <view class="electron-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>
@@ -120,147 +81,52 @@
            <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">
      <t-tabs
        defaultValue="{{tabValue}}"
        bind:change="onTabsChange"
        t-class="custom-tabs"
        t-class-content="custom-panel"
        class="tab-class"
      >
      <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
        <t-tab-panel label="图书简介" 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"
          >
          <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>
        <t-tab-panel
          label="电子书"
          value="jsek_eBook"
          style="{{tabPanelstyle}}"
        >
          <epub-view
            fileInfo="{{fileInfo}}"
            id="eBook"
            class="webView"
          ></epub-view>
        <t-tab-panel label="电子书" value="jsek_eBook" style="{{tabPanelstyle}}">
          <epub-view fileInfo="{{fileInfo}}" id="eBook" class="webView"></epub-view>
        </t-tab-panel>
        <t-tab-panel
          label="教学资源"
          value="jsek_teachingResources"
          class="{{loading ? 'loading': ''}}"
        >
        <t-tab-panel label="教学资源" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
          <view wx:if="{{!loading && teach.length && !noResources}}">
            <teach-resource
              applyState="{{applyState}}"
              rejectCause="{{rejectCause}}"
              deadline="{{deadline}}"
              bind:applyResource="applyResource"
              applyResourceLoading="{{applyResourceLoading}}"
            ></teach-resource>
            <tree
              openIds="{{openTeachids}}"
              bookInfo="{{bookDetail}}"
              treeList="{{teach}}"
              tab="{{tabValue}}"
              applyState="{{applyState}}"
              bind:downloadTeach="downloadTeach"
              openTeachids="{{openTeachids}}"
              wx:if="{{teach.length}}"
            ></tree>
            <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
            <tree openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
          </view>
          <t-loading
            theme="circular"
            size="60rpx"
            class="loading"
            loading="{{loading }}"
          />
          <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel
          label="云学习"
          value="jsek_cloudLearning"
          style="{{tabPanelstyle}}"
        >
        <t-tab-panel label="云学习" 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}}"
            ></learn-resource>
            <tree
              id="tree"
              openIds="{{openLearnids}}"
              bookInfo="{{bookDetail}}"
              tab="{{tabValue}}"
              treeList="{{learn}}"
              buyIds="{{buyIdList}}"
              openLearnids="{{openLearnids}}"
            ></tree>
            <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
            <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
          </view>
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
        </t-tab-panel>
        <t-tab-panel
          label="云测试"
          value="questionBank"
          style="{{tabPanelstyle}}"
        >
        <t-tab-panel label="云测试" value="questionBank" style="{{tabPanelstyle}}">
          <view wx:if="{{!loading && test.length}}">
            <test-resource
              list="{{test}}"
              bookInfo="{{bookDetail}}"
              mockData="{{mockData}}"
            ></test-resource>
            <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
          </view>
          <view wx:if="{{noResources}}" class="noData">
            <t-empty icon="folder-open" description="暂无数据" />
@@ -275,77 +141,31 @@
    <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="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
        bind:tap="addBookShopcCar"
        wx:if="{{tabValue != 'jsek_eBook'}}"
        >加入购物车</view
      >
      <view
        class="buy  {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
        bind:tap="buyBtn"
        wx:if="{{tabValue != 'jsek_eBook'}}"
        >立即购买</view
      >
      <view
        class="shopCar shopCarColor"
        bind:tap="addBookShopcCar"
        wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
        >加入购物车</view
      >
      <view
        class="buy buyColor"
        bind:tap="buyBtn"
        wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
        >立即购买</view
      >
      <view
        class="read buyColor"
        bind:tap="goRead"
        wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
        >立即查看</view
      >
      <view class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar" wx:if="{{tabValue != 'jsek_eBook'}}">加入购物车</view>
      <view class="buy  {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn" wx:if="{{tabValue != 'jsek_eBook'}}">立即购买</view>
      <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">加入购物车</view>
      <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">立即购买</view>
      <view class="read buyColor" bind:tap="goRead" wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}">立即查看</view>
    </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="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>

 packageDomain/pages/sampleBookList/applicationForm/index.js

@@ -102,7 +102,6 @@
            'teacherInfo.workInfo': res[0].cmsTypeLinks[0].children,
          })
        }
        console.log(this.data.teacherInfo.workInfo, 333)
      })
  },
  //获取当前已申请次数（电子）
@@ -184,7 +183,6 @@
        that.setData({
          'teacherInfo.detailedAddress': mailAddress
        })
        console.log(that.data.teacherInfo.workInfo, 345)

        data = {
          topicIdOrRefCode: 'applyEntityBook',

 packageDomain/pages/sampleBookList/index.js

@@ -352,9 +352,6 @@
        },
      ],
      sort,
      coverSize: {
        height: 145,
      },
      paging: {
        start: that.data.page * that.data.limit - that.data.limit,
        size: that.data.limit

 packageDomain/pages/sampleBookList/index.wxss

@@ -13,6 +13,7 @@

.bookServices-list {
  padding-top: 294rpx;
  background: #F2F3F8;
}

.content {
@@ -134,9 +135,7 @@
  transform: rotate(180deg);
}

.list-body {
  background: #F2F3F8;
}
.list-body {}

.title {
  display: flex;

 packageDomain/pages/teacherCertification/index.js

@@ -167,7 +167,6 @@
            })
          }
          let info = getTopicMsgCmsItemFile(this.data.worksInfo, resData.cmsItemDataList)
          console.log(info)
          this.setData({
            'teacherInfo.fullName': info.fullName,
            'teacherInfo.schoolName': info.schoolName,
@@ -351,7 +350,6 @@
      sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
      success: function (res) {
        // 返回选定照片的本地文件路径列表，tempFilePath也可以作为img标签的src属性显示图片
        console.log(res.tempFiles[0], 12);
        wx.getFileSystemManager().readFile({
          filePath: res.tempFiles[0].tempFilePath, //选择图片返回的相对路径
          // encoding: 'binary', //编码格式
@@ -446,7 +444,6 @@
    })
  },
  onChange() {
    console.log(this.data.teacherInfo.agree, 12)
    if (this.data.teacherInfo.agree) {
      this.setData({
        'teacherInfo.agree': false,
@@ -547,7 +544,6 @@
          that.data.teacherInfo,
          that.data.imgPics
        );
        console.log(dataRequests, 4)
        const data = {
          description: '',
          icon: '',

 packageDomain/pages/teacherCertification/index.wxml

@@ -75,7 +75,7 @@
            <view class="weui-uploader">
              <view class='pics' wx:for="{{imgPics}}" wx:for-item="item" wx:key="*this">
                <image class='weui-uploader__img' src="{{item.url}}" data-index="{{index}}" mode="aspectFill" bindtap="previewImg">
                  <icon type='cancel' class="delete-btn" data-index="{{index}}" catchtap="deleteImg"></icon>
                  <icon type='cancel' class="delete-btn" data-index="{{index}}" catchtap="deleteImg" wx:if="{{editState}}"></icon>
                </image>
              </view>
              <view class="tp_cont {{tj_ycang?'':'hide'}}" bindtap="chooseImg" wx:if="{{editState}}">

 packagePersonal/pages/aboutUs/index.js

@@ -104,7 +104,6 @@
        bannerList: res.datas[0].icon,
        swiperList: res.datas[0].icon
      })
      console.log(this.data.bannerList, 789);
    })
  },


 packagePersonal/pages/activateProduct/index.wxml

@@ -25,7 +25,7 @@
        </view>
        <view class="contentBox">

          <view class="list" wx:if="{{list.length > 0}}">
          <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
            <view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
              <view class="codeInfoBox">
                <view>激活码：{{items.code}}</view>
@@ -57,7 +57,7 @@
              </view>
            </view>
          </view>
          <view wx:if="{{list.length == 0}}" class="empyt">
          <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
            <t-empty icon="folder-open" description="暂无数据" />
          </view>
          <view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -66,6 +66,9 @@
          <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
            <text>没有更多了</text>
          </view>
          <view class="body-loading" wx:if="{{skeletonLoding}}">
            <t-loading theme="circular" size="40rpx" text="加载中..." class="wrapper" />
          </view>
        </view>
      </view>
    </view>

 packagePersonal/pages/activateProduct/index.wxss

@@ -156,3 +156,8 @@
  padding: 100rpx 0;
  background: #fff;
}

.body-loading {
  padding: 200rpx 0;
  text-align: center;
}

 packagePersonal/pages/feedBack/index.js

@@ -39,8 +39,7 @@
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    console.log(options);
    this.getDataList(false);
    console.log(options)
  },

  /**
@@ -54,7 +53,7 @@
   * 生命周期函数--监听页面显示
   */
  onShow() {

    this.getDataList(false);
  },
  /**
   * 生命周期函数--监听页面卸载
@@ -64,7 +63,6 @@
  },

  tabBookClick(item) {
    console.log(item, 1)
    let that = this;
    let info = this.data.tabList[item.detail.value]
    that.setData({
@@ -112,7 +110,6 @@
              isMoreData: dataList.length > 0 ? false : true,
              skeletonLoding: false,
            })
            console.log(this.data.list, 123)
          } else {
            this.setData({
              skeletonLoding: false,

 packagePersonal/pages/feedBack/index.wxml

@@ -1,8 +1,10 @@
<view class="container">
  <view class="page-header">
  <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{active}}" bind:change="tabBookClick">
    <t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}">
    </t-tab-panel>
  </t-tabs>
  </view>
  <view class="pageInfo">
    <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
      <view slot="refresher" class="refresh-container">
@@ -28,7 +30,7 @@
        <view wx:if="{{activeName == 'feedback'}}" class="backBox">
          <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
            <view class="item-con">
              <view class="item-title">{{item.name}}</view>
              <view class="item-title">{{item.content.content}}</view>
              <view class="backCon">
                <view>
                  回复：{{item.feedBack}}

 packagePersonal/pages/feedBack/index.wxss

@@ -1,25 +1,28 @@
page {
  background-color: #f0f2f5;
}

.container {
  width: 100vw;
  height: 100vh;
  padding: 0 20rpx;
}

.content {
  height: calc(100vh - env(safe-area-inset-bottom) - 86rpx);
  box-sizing: border-box;
.container {
  width: 100%;
  height: 100vh;
}

.page-header {
  background-color: #F2F3F8;
  width: 100%;
  position: fixed;
  top: 0;
  left: 0;
  z-index: 1
  z-index: 1;
}

.pageInfo {
  padding-top: 90rpx;
}

.content {
  height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
  box-sizing: border-box;
}

.t-tabs__track {
@@ -75,14 +78,6 @@
  text-align: center;
}

.container {
  height: calc(100vh - env(safe-area-inset-bottom));
  box-sizing: border-box;
}

.pageInfo {
  margin-top: -30rpx;
}

.content-item {
  background: #fff;

 packagePersonal/pages/myCollection/index.js

@@ -48,7 +48,6 @@
  },

  tabBookClick(item) {
    console.log(item, 1)
    let that = this;
    let info = this.data.tabList[item.detail.value]
    that.setData({

 packagePersonal/pages/myCollection/index.wxml

@@ -9,7 +9,7 @@
          <t-loading theme="circular" size="40rpx" text="正在刷新..." class="wrapper" />
        </view>
      </view>
      <view class="list" wx:if="{{list.length > 0}}">
      <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
        <view wx:if="{{activeName == 'FavoriteBookCity'}}" class="listBox">
          <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
            <view class="icon" data-book="{{item}}" bindtap="goBookDetails">
@@ -34,7 +34,7 @@
              </view>
            </view> -->
      </view>
      <view wx:if="{{list.length == 0}}" class="empyt">
      <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
        <t-empty icon="folder-open" description="暂无数据" />
      </view>
      <view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -43,6 +43,9 @@
      <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
        <text>没有更多了</text>
      </view>
      <view class="body-loading" wx:if="{{skeletonLoding}}">
        <t-loading theme="circular" size="40rpx" text="加载中..." class="wrapper" />
      </view>
    </scroll-view>
  </view>


 packagePersonal/pages/myCollection/index.wxss

@@ -157,3 +157,8 @@
.empyt {
  padding: 200rpx 0;
}

.body-loading {
  padding: 200rpx 0;
  text-align: center;
}

 packagePersonal/pages/myOrder/index.js

@@ -56,7 +56,6 @@

  },
  tabBookClick(item) {
    console.log(item, 1)
    let that = this;
    let info = this.data.tabList[item.detail.value]
    that.setData({
@@ -200,7 +199,6 @@

  onCancel(e) {
    let { orderNum } = e.currentTarget.dataset
    console.log(orderNum, 12)
    wx.showModal({
      title: '提示', //提示的标题
      content: '确定要取消订单？', //提示的内容

 packagePersonal/pages/myOrder/index.wxml

@@ -16,7 +16,7 @@
          <t-loading theme="circular" size="40rpx" text="正在刷新..." class="wrapper" />
        </view>
      </view>
      <view class="list" wx:if="{{list.length > 0}}">
      <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
        <view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
          <view class="order-cent">
            <text class="order-cent-one">订单号: {{items.orderNumber}}</text>
@@ -60,7 +60,7 @@
          </view>
        </view>
      </view>
      <view wx:if="{{list.length == 0}}" class="empyt">
      <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
        <t-empty icon="folder-open" description="暂无数据" />
      </view>
      <view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -69,6 +69,9 @@
      <view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
        <text>没有更多了</text>
      </view>
      <view class="body-loading" wx:if="{{skeletonLoding }}">
        <t-loading theme="circular" size="40rpx" text="加载中..." class="wrapper" />
      </view>
    </scroll-view>
  </view>
</view>

 packagePersonal/pages/myOrder/index.wxss

@@ -242,5 +242,9 @@

.empyt {
  padding: 200rpx 0;
  background: #fff;
}

.body-loading {
  padding: 200rpx 0;
  text-align: center;
}

 packagePersonal/pages/sampleBooks/index.js

@@ -51,7 +51,6 @@
        active: options.tabActive,
        active1: options.stateTab
      })
      console.log(this.data.active)
      if (this.data.active == '1') {
        this.setData({
          topicIdOrRefCode: 'applyBook',

 packagePersonal/pages/userSetting/index.js

@@ -97,7 +97,6 @@
  },
  //修改用户类型
  editUserInfo(e) {
    console.log(e)
    let { info } = e.currentTarget.dataset
    if (!this.data.userInfoBox) {
      this.setData({
@@ -124,9 +123,7 @@
      sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
      success: function (res) {
        // 返回选定照片的本地文件路径列表，tempFilePath也可以作为img标签的src属性显示图片
        console.log(res.tempFiles[0])
        tool.getFileMd5(res.tempFiles[0]).then((e) => {
          console.log(e, 4)
          let formData = new FormData();
          formData.append('Md5', e);
          formData.append('FileName', e);
@@ -150,7 +147,6 @@
              },
              data: data.buffer,
              success(res) {
                console.log(res)
                if (res.statusCode == 200) {
                  resolve(res.data);
                  if (res.data) {
@@ -198,7 +194,6 @@
  },
  //输入手机号
  onPhoneInput(e) {
    console.log(e)
    const { phoneError } = this.data;
    const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
    if (phoneError === isPhoneNumber) {
@@ -296,7 +291,6 @@
  },

  getEmailCode() {
    console.log(this.data.userInfoForm.email)
    if (this.data.userInfoForm.email && this.data.userInfoForm.captcha) {
      app.MG.identity
        .getEmailCode({

 pages/home/home.js

@@ -23,6 +23,7 @@
    courseList: [],
    bookTypeList: [],//图书类型
    activeItem1: 0,
    bookTypeData: {},
    booksList: [],
    readBookList: [], //数字阅读
    textbookList: [], //数字教材
@@ -92,7 +93,6 @@

  getCurrentUserInfo() {
    app.MG.identity.getCurrentAppUser().then(res => {
      console.log(res, "userInfo");
      // 用户信息优先级：教师认证 > 微信 > 学生（注册时默认）
      if (res) {
        let defaultUser = {};
@@ -142,7 +142,6 @@
        bannerList: list
      })
    })
    console.log('轮播图', this.data.bannerList);
  },


@@ -313,7 +312,10 @@
  //图书服务
  tabBookClick(item) {
    let info = this.data.bookTypeList[item.detail.value]
    console.log(info, 123)
    bookTypeData
    this.setData({
      bookTypeData: info,
    })
    this.getBooksList(info)
  },
  //数字阅读
@@ -409,7 +411,7 @@
    wx.showToast({
      title: "建设中",
      icon: 'none',
      duration: 2000
      duration: 1000
    })
  },
  goCourseDetail(e) {
@@ -417,7 +419,7 @@
    wx.showToast({
      title: "建设中",
      icon: 'none',
      duration: 2000
      duration: 1000
    })
  },
  goReadBookDetail(e) {
@@ -425,7 +427,7 @@
    wx.showToast({
      title: "建设中",
      icon: 'none',
      duration: 2000
      duration: 1000
    })
  },
  goTextBookDetail(e) {
@@ -433,7 +435,7 @@
    wx.showToast({
      title: "建设中",
      icon: 'none',
      duration: 2000
      duration: 1000
    })
  },

@@ -457,7 +459,12 @@
  },
  addCart(e) {
    const { info } = e.currentTarget.dataset;
    console.log(info)
    wx.showToast({
      title: "建设中",
      icon: 'none',
      duration: 1000
    })
    return;
    if (wx.getStorageSync(app.config.tokenKey)) {
      let query = {
        start: 0,
@@ -504,16 +511,15 @@
  },
  onMoreGuide(e) {
    let type = e.currentTarget.dataset.info
    console.log(e, 1)
    if (type == "tushufuwu") {
      wx.navigateTo({
        url: '/packageBookService/pages/bookServices/list/index'
        url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name
      })
    } else {
      wx.showToast({
        title: "建设中",
        icon: 'none',
        duration: 2000
        duration: 1000
      })
    }

@@ -527,7 +533,6 @@
    })
  },
  onRetrievalPage() {
    console.log(this.data.searchVal);
    wx.navigateTo({
      url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
    })

 pages/home/home.wxml

@@ -69,12 +69,12 @@
        <view class="listBox1">
          <view wx:if="{{courseList.length>0}}">
            <view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
              <view class="listItem flex" data-book="{{item}}" bindtap="goCourseDetail">
                <view class="specialSubject-img">
              <view class="listItem flex">
                <view class="specialSubject-img" data-book="{{item}}" bindtap="goCourseDetail">
                  <image src="{{item.icon}}" mode="aspectFill" class="img" />
                </view>
                <view class="body-info">
                  <view class="name">{{item.name}}</view>
                  <view class="name" data-book="{{item}}" bindtap="goCourseDetail">{{item.name}}</view>
                  <view class="flex jc-sb">
                    <text class="author">{{item.courseLeader}}</text>
                    <text class="classHours">{{item.classHours}}课时</text>
@@ -158,13 +158,13 @@
        <view class="listBox3">
          <view wx:if="{{textbookList.length > 0}}">
            <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
              <view class="listItem flex" bind:tap="goTextBookDetail" data-book="{{item}}">
                <view class="specialSubject-img">
              <view class="listItem flex">
                <view class="specialSubject-img" bind:tap="goTextBookDetail" data-book="{{item}}">
                  <image src="{{item.icon}}" mode="aspectFit" class="img" />
                </view>
                <view class="body-info">
                  <view class="name">{{item.name}}</view>
                  <view class="introduction">{{item.description}}</view>
                  <view class="name" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.name}}</view>
                  <view class="introduction" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.description}}</view>
                  <view class="author">{{item.author}}</view>
                  <view class="priceBox flex jc-sb">
                    <text class="price" wx:if="{{item.price == 0}}">免费</text>
@@ -186,6 +186,7 @@
        </view>
        <view class="rankingList">
          <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
            <view class="booksListBox">
            <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
              <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
                <view class="specialSubject-img">
@@ -198,6 +199,7 @@
                </view>
              </view>
            </view>
            </view>
          </scroll-view>
        </view>
      </view>

 pages/home/home.wxss

@@ -29,7 +29,7 @@
}

.home-page-header {
  padding-top: 230rpx;
  padding-top: 180rpx;
}

.home-page-header .bg {
@@ -97,7 +97,7 @@
  margin-top: 20rpx;
  display: block;
  padding: 0 24rpx;
  padding-bottom: 10vh;
  margin-bottom: 11vh;
}

.tabCardPublic {
@@ -212,6 +212,7 @@
  text-overflow: ellipsis;
  /* 超出部分显示省略号 */
  white-space: normal;
  flex: 1;
}

.body-info .price {
@@ -227,7 +228,7 @@
  color: #ff6d00;
  font-size: 30rpx;
  background-repeat: no-repeat;
  background-size: 34% 64%;
  background-size: 40% 64%;
  background-position: right;
  background-image: url(http://182.92.203.7:3007/jsek/website/image/click-icon.png);
}
@@ -343,6 +344,7 @@

.listBox3 .body-info {
  width: calc(100% - 190rpx);
  padding: 10rpx;
}

.listBox3 .name {
@@ -352,7 +354,7 @@
  font-weight: bold;
  line-height: 40rpx;
  display: -webkit-box;
  margin-bottom: 10rpx;
  margin-bottom: 12rpx;
  -webkit-box-orient: vertical;
  -webkit-line-clamp: 1;
  overflow: hidden;
@@ -364,7 +366,6 @@
  color: #B4B6BD;
  line-height: 36rpx;
  display: -webkit-box;
  margin-bottom: 14rpx;
  -webkit-box-orient: vertical;
  -webkit-line-clamp: 2;
  overflow: hidden;
@@ -373,7 +374,7 @@

.listBox3 .author {
  line-height: 40rpx;
  margin-bottom: 20rpx;
  margin: 16rpx 0;
}

.readList {
@@ -386,12 +387,15 @@

.srcolbox {
  width: 100%;
  height: 420rpx;
  height: 400rpx;
  white-space: nowrap;
}

.booksListBox {
  display: flex;
}

.srcolbox .booksListItemBox {
  display: inline-block;
  width: 188rpx;
  margin-right: 30rpx;
}

 pages/personalCenter/feedBackSubmit/index.js

@@ -10,6 +10,7 @@
    mannder: "",
    content: "",
    lock: true,
    phoneError: false,
  },

  /**
@@ -64,10 +65,15 @@
      userName: e.detail.value,
    });
  },
  bindTnputBlur1: function (e) {
  onPhoneInput(e) {
    const { phoneError } = this.data;
    const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
    if (phoneError === isPhoneNumber) {
    this.setData({
        phoneError: !isPhoneNumber,
      mannder: e.detail.value,
    });
    }
  },
  bindTextAreaBlur: function (e) {
    this.setData({
@@ -78,14 +84,14 @@
  submit() {
    if (this.data.lock) {
      this.data.lock = false;
      if (this.data.userName) {
        if (this.data.mannder) {
          if (this.data.content) {
      if (this.data.userName.replace(/^\s*|\s*$/g, "")) {
        if (this.data.mannder.replace(/^\s*|\s*$/g, "")) {
          if (this.data.content.replace(/^\s*|\s*$/g, "")) {
            let submitData = {
              content: this.data.content,
              name: this.data.userName,
              content: this.data.content.replace(/^\s*|\s*$/g, ""),
              name: this.data.userName.replace(/^\s*|\s*$/g, ""),
              email: "",
              phone: this.data.mannder
              phone: this.data.mannder.replace(/^\s*|\s*$/g, "")
            };
            var data = {
              topicIdOrRefCode: "feedback",
@@ -130,7 +136,7 @@
      } else {
        this.data.lock = true;
        wx.showToast({
          title: "联系人不能为空不能为空",
          title: "联系人不能为空",
          icon: 'none',
          duration: 1000
        })

 pages/personalCenter/feedBackSubmit/index.json

@@ -1,4 +1,6 @@
{
  "navigationBarTitleText": "意见反馈",
  "usingComponents": {}
  "usingComponents": {
    "t-input": "tdesign-miniprogram/input/input"
  }
}

 pages/personalCenter/feedBackSubmit/index.wxml

@@ -3,13 +3,13 @@
    <view class="from-item">
      <view class="label"> 联系人： </view>
      <view class="item-content">
        <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{userName}}" placeholder="请输入联系人" bindinput="bindTnputBlur" />
        <t-input placeholder="请输入联系人" borderless value="{{userName}}" type="number" bindchange="bindTnputBlur" />
      </view>
    </view>
    <view class="from-item">
      <view class="label"> 联系方式： </view>
      <view class="item-content">
        <input class="weui-input" name="mannder" auto-focus="true" adjust-position="true" value="{{mannder}}" placeholder="请输入联系方式" bindinput="bindTnputBlur1" />
        <t-input placeholder="输入联系方式" borderless value="{{mannder}}" type="number" tips="{{phoneError ? '手机号输入不正确' : ''}}" bindchange="onPhoneInput" />
      </view>
    </view>
    <view class="from-item">

 pages/personalCenter/feedBackSubmit/index.wxss

@@ -24,6 +24,14 @@
  padding: 10rpx;
}

.t-input {
  padding: 0 !important;
}

.t-input__placeholder {
  font-size: 28rpx !important
}

.submit {
  background: #ff6c00;
  color: #fff;

 pages/personalCenter/index.js

@@ -281,7 +281,6 @@
    });
  },
  tabUserTypeClick(e) {
    console.log(e)
    let { info } = e.currentTarget.dataset;
    this.setData({
      userTypeActive: info.value,
@@ -320,7 +319,6 @@

  //点击目录
  toPages(item) {
    console.log(item)
    let info = item.currentTarget.dataset.info
    if (info.url) {
      wx.navigateTo({
@@ -337,7 +335,7 @@

  onScroll(e) {
    this.setData({
      isWhite: e.scrollTop > 20 ? true : false
      isWhite: e.detail.scrollTop > 10 ? true : false
    })
  },


 pages/personalCenter/index.wxss

@@ -35,7 +35,7 @@
.content-wrapper {
  position: relative;
  padding: 30rpx;
  padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx);
  padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
}

.topBox {

 pages/student/index.js

@@ -53,7 +53,6 @@

  tabClick(item) {
    let that = this;
    console.log(item)
    that.setData({
      active: item.detail.value,
    })
@@ -116,7 +115,6 @@
            loading: false
          })
        }
        console.log(this.data.list)
      } catch (error) {
        console.log(error)
      }

 pages/student/index.wxss

@@ -106,7 +106,7 @@
}

.content {
  height: calc(100vh - env(safe-area-inset-bottom) - 436rpx);
  height: calc(100vh - env(safe-area-inset-bottom) - 456rpx);
  box-sizing: border-box;
}

@@ -117,7 +117,7 @@
}

.content-item {
  background: #f1f1f1;
  background: #F7F7F7;
  border-radius: 10rpx;
  box-sizing: border-box;
  width: calc(100%/2 - 10rpx);

 static/images/home/home-cart.png

 static/images/personal/about.png

 static/images/personal/certificate.png

 static/images/personal/chushu.png

 static/images/personal/contact.png

 static/images/personal/download.png

 static/images/personal/feedback.png

 static/images/personal/jihuo.png

 static/images/personal/notification.png

 static/images/personal/notification1.png

 static/images/personal/order.png

 static/images/personal/quxiaoshoucang.png

 static/images/personal/setting.png

 static/images/personal/suggestion.png

 static/images/personal/upload.png

 static/images/personal/wodeshoucang.png

 static/images/personal/yangshushenqing.png