litian
2024-03-18 dd8ef90009ff67a7379b50e2861f917579f0f855
jiaoshi
9个文件已修改
502 ■■■■■ 已修改文件
assets/js/middleGround/api/resource.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/teacherCertification/index.js 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/teacherCertification/index.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/teacherCertification/index.wxml 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/teacherCertification/index.wxss 103 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.wxml 299 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.wxss 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/personalCenter/index.wxss 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/testLogin/index.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
assets/js/middleGround/api/resource.js
@@ -185,7 +185,7 @@
  //获取资源类型
  getCmsTypeByRefCode(data) {
    return request({
      url: "resource/api/ApiGetCmsTypeByRefCode",
      url: "/resource/api/ApiGetCmsTypeByRefCode",
      method: "post",
      data,
    });
packageDomain/pages/teacherCertification/index.js
@@ -32,6 +32,7 @@
    userId: '',
    fileList: [],
    protocolTxt: '', //教师协议
    protocolShow: false,
    editState: true,
    reasonTxt: ""
  },
@@ -39,10 +40,10 @@
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    console.log(options, 111);
  onLoad() {
    this.getpositionalTitle();
    this.getAgreement();
    if (wx.getStorageSync(app.config.tokenKey)) {
      this.getUserRole()
    }
@@ -78,7 +79,6 @@
  getUserRole() {
    app.MG.identity.getCurrentAppUser().then((res) => {
      if (res) {
        this.getType()
        this.setData({
          userId: res.userId
@@ -128,10 +128,10 @@
    })
  },
  getType() {
    const data = {
    app.MG.resource.getCmsTypeByRefCode({
      refCodes: ['jsek_teacherCertification']
    }
    app.MG.resource.getCmsTypeByRefCode(data).then((res) => {
    }).then((res) => {
      console.log(res)
      this.setData({
        worksInfo: res[0].cmsTypeLinks[0].children,
      })
@@ -253,6 +253,7 @@
      }
    })
  },
  //选择职称
  onTeachPicker() {
    this.setData({ teachVisible: true });
@@ -359,12 +360,26 @@
      fileList,
    });
  },
  onChange() {
  },
  //查看教师认证服务
  viewContent() {
    this.setData({
      protocolShow: true,
    });
  },
  onVisibleChange(e) {
    this.setData({
      protocolShow: e.detail.visible,
    });
  },
  /**
   * 页面相关事件处理函数--监听用户下拉动作
   */
  onPullDownRefresh() {
  },
  /**
packageDomain/pages/teacherCertification/index.json
@@ -5,6 +5,8 @@
    "t-picker": "tdesign-miniprogram/picker/picker",
    "t-picker-item": "tdesign-miniprogram/picker-item/picker-item",
    "t-input": "tdesign-miniprogram/input/input",
    "t-upload": "tdesign-miniprogram/upload/upload"
    "t-upload": "tdesign-miniprogram/upload/upload",
    "t-popup": "tdesign-miniprogram/popup/popup",
    "t-checkbox": "tdesign-miniprogram/checkbox/checkbox"
  }
}
packageDomain/pages/teacherCertification/index.wxml
@@ -1,7 +1,7 @@
<view class="container">
  <view class="tips"> 仅限学校本课程任课教师申请;请上传有效在职教师工作证将有助于审核。 </view>
  <view class="page-body">
    <form catchsubmit="formSubmit" catchreset="formReset" class="formBox">
    <view class="baseInfoBox">
      <view class="from-item">
        <view class="label"> 当前状态: </view>
        <view class="stateBox">
@@ -14,13 +14,13 @@
      <view class="from-item">
        <view class="label"> 学校: </view>
        <view class="item-content">
          <t-input placeholder="请输入学校" borderless value="{{teacherInfo.schoolName}}" />
          <t-input placeholder="请输入学校" borderless value="{{teacherInfo.schoolName}}" disabled="{{!editState}}" />
        </view>
      </view>
      <view class="from-item">
        <view class="label"> 真实姓名: </view>
        <view class="item-content">
          <t-input placeholder="请输入真实姓名" borderless value="{{teacherInfo.fullName}}" />
          <t-input placeholder="请输入真实姓名" borderless value="{{teacherInfo.fullName}}" disabled="{{!editState}}" />
        </view>
      </view>
      <view class="from-item">
@@ -62,16 +62,32 @@
          <t-input placeholder="请输入详细地址" borderless value="{{teacherInfo.detailedAddress}}" />
        </view>
      </view>
    </view>
    <view class="fileInfoBox">
      <view class="from-item">
        <view class="label"> 在职教师工作证: </view>
        <view class="wrapper">
          <t-upload mediaType="{{['image']}}" files="{{fileList}}" bind:add="handleAdd" bind:remove="handleRemove">
          </t-upload>
        <view class="imageBox">
          <view class="wrapper">
            <t-upload mediaType="{{['image']}}" files="{{fileList}}" bind:add="handleAdd" bind:remove="handleRemove">
            </t-upload>
          </view>
        </view>
        <view class="fileTip">
          教务处盖章文件、校工卡皆可
        </view>
      </view>
      <view class="btn-area">
        <button class="submit" formType="submit">提交</button>
      </view>
    </form>
    </view>
    <view class="protocolBox">
      <t-checkbox label="" icon="rectangle" default-checked="{{teacherInfo.agree}}" bind:change="onChange" />
      <text class="wait" bind:tap="viewContent">《教师认证服务条款》</text>
    </view>
    <view class="btn-area">
      <button class="submit" formType="submit">提交</button>
    </view>
  </view>
  <t-popup visible="{{protocolShow}}" bind:visible-change="onVisibleChange" placement="center" close-btn>
    <view class="block">
      <rich-text space="emsp" nodes="{{protocolTxt}}" class="content" />
    </view>
  </t-popup>
</view>
packageDomain/pages/teacherCertification/index.wxss
@@ -1,3 +1,13 @@
page {
  background: #F2F3F8;
}
.container {
  width: 100%;
  padding-bottom: env(safe-area-inset-bottom);
  overflow: auto;
}
.tips {
  line-height: 24px;
  font-size: 28rpx;
@@ -5,21 +15,34 @@
  background: rgba(255, 108, 0, 0.1);
  color: #ff6c00;
  text-align: center;
  margin: 0 auto 20px auto;
  margin: 0 auto 20rpx auto;
}
.page-body {
  padding: 20rpx;
  font-size: 28rpx;
}
.from-item {
.baseInfoBox {
  background: #fff;
  margin-top: 20rpx;
  border-radius: 10rpx;
  padding: 30rpx;
}
.fileInfoBox {
  background: #fff;
  margin-top: 20rpx;
  border-radius: 10rpx;
  padding: 30rpx;
}
.baseInfoBox .from-item {
  margin-bottom: 20rpx;
  display: flex;
}
.from-item .label {
  width: 240rpx;
.baseInfoBox .from-item .label {
  width: 200rpx;
  height: 68rpx;
  line-height: 68rpx;
}
@@ -38,10 +61,7 @@
  padding: 0 !important;
}
.submit {
  background: #ff6c00;
  color: #fff;
}
.t-cell {
  padding: 0 !important;
@@ -86,10 +106,67 @@
  color: #1FBC1F
}
.wrapper {
  width: 56%;
.fileInfoBox .from-item .label {
  width: 240rpx;
  height: 68rpx;
  line-height: 68rpx;
}
.t-grid-item {
  width: 50% !important;
.imageBox {
  border: 2rpx solid #D9D9D9;
  padding: 20rpx;
}
.wrapper {
  width: 100%;
}
.fileTip {
  font-size: 24rpx;
  color: #949494;
  margin-top: 20rpx;
}
.protocolBox {
  padding: 20rpx;
  display: flex;
}
.t-checkbox {
  background: none !important
}
.t-checkbox--block {
  padding: 0 !important;
}
.t-picker__confirm {
  color: #ff6c00 !important;
}
.t-popup {
  width: 80% !important;
}
.t-popup__content {
  padding: 40rpx 10rpx !important;
  padding-top: 80rpx !important;
}
.block {
  height: 450px !important;
  overflow: auto !important;
}
.btn-area {
  width: 80%;
  margin: 0 auto;
}
.submit {
  background: #ff6c00;
  color: #fff;
  border-radius: 50rpx;
}
pages/home/home.wxml
@@ -13,104 +13,126 @@
      <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
    </t-search>
  </view>
  <view class="swiper-wrap">
    <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" current="{{current}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{navigation}}" bind:click="navToActivityDetail" />
  <view class="home-page-menu">
    <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}">
      <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" />
    </t-grid>
  </view>
</view>
<view class="home-page-menu">
  <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}">
    <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" />
  </t-grid>
</view>
<view class="home-page-container">
  <view class="home-page-list">
    <view class="tabCardPublic">
      <view class="icon">
        <t-image src="/static/images/home/zhuantitaolun.png" mode="heightFix" class="iconImage" />
      </view>
      <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
        <text class="more">更多</text>
        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
      </view>
    </view>
    <view class="listBox">
      <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
        <view class="listItem">
          <view class="specialSubject-img">
            <image src="{{item.icon}}" mode="aspectFill" class="img" />
          </view>
          <view class="body-info">
            <view class="name">{{item.name}}</view>
            <view class="time" wx:if="{{item.liveTime}}">直播时间:<text>{{item.liveTime}}</text></view>
            <view class="time" wx:if="{{item.startTime}}">开播时间:<text>{{ item.startTime }}</text></view>
            <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">开播时间:<text class="grey">待定</text></view>
            <view class="flex jc-sb">
              <text class="author">{{item.lecturer}}</text>
              <text class="price" wx:if="{{item.price == 0}}">免费</text>
              <text class="price" wx:if="{{item.price !== 0}}">¥{{item.price}}</text>
            </view>
          </view>
  <view class="home-page-container">
    <view class="home-page-list">
      <view class="tabCardPublic">
        <view class="icon">
          <t-image src="/static/images/home/zhuantitaolun.png" mode="heightFix" class="iconImage" />
        </view>
        <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
          <text class="more">更多</text>
          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
        </view>
      </view>
    </view>
    <view class="tabCardPublic">
      <view class="icon">
        <t-image src="/static/images/home/jingxuankecheng@2x.png" mode="heightFix" class="iconImage" />
      </view>
      <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
        <text class="more">更多</text>
        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
      </view>
    </view>
    <view class="home-page-tabs">
      <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle">
        <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
      </t-tabs>
    </view>
    <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">
      <view class="listBox">
        <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
          <view class="listItem">
            <view class="specialSubject-img">
              <image src="{{item.icon}}" mode="aspectFill" class="img" />
            </view>
            <view class="body-info">
              <view class="name">{{item.name}}</view>
              <view class="time" wx:if="{{item.liveTime}}">直播时间:<text>{{item.liveTime}}</text></view>
              <view class="time" wx:if="{{item.startTime}}">开播时间:<text>{{ item.startTime }}</text></view>
              <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">开播时间:<text class="grey">待定</text></view>
              <view class="flex jc-sb">
                <text class="author">{{item.courseLeader}}</text>
                <text>{{item.classHours}}课时</text>
              </view>
              <view class="priceBox flex jc-sb">
                <text class="author">{{item.lecturer}}</text>
                <text class="price" wx:if="{{item.price == 0}}">免费</text>
                <text class="price" wx:if="{{item.price !== 0}}">¥{{item.price}}</text>
                <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
              </view>
            </view>
          </view>
        </view>
      </view>
      <view class="empyt" wx:else>
        <t-empty icon="folder-open" description="暂无数据" font-size="80" />
      <view class="tabCardPublic">
        <view class="icon">
          <t-image src="/static/images/home/jingxuankecheng@2x.png" mode="heightFix" class="iconImage" />
        </view>
        <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
          <text class="more">更多</text>
          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
        </view>
      </view>
    </view>
    <view class="tabCardPublic">
      <view class="icon">
        <t-image src="/static/images/home/tushufuwu@2x.png" mode="heightFix" class="iconImage" />
      <view class="home-page-tabs">
        <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle">
          <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
        </t-tabs>
      </view>
      <view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
        <text class="more">更多</text>
        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
      <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">
              <view class="specialSubject-img">
                <image src="{{item.icon}}" mode="aspectFill" class="img" />
              </view>
              <view class="body-info">
                <view class="name">{{item.name}}</view>
                <view class="flex jc-sb">
                  <text class="author">{{item.courseLeader}}</text>
                  <text>{{item.classHours}}课时</text>
                </view>
                <view class="priceBox flex jc-sb">
                  <text class="price" wx:if="{{item.price == 0}}">免费</text>
                  <text class="price" wx:if="{{item.price !== 0}}">¥{{item.price}}</text>
                  <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
                </view>
              </view>
            </view>
          </view>
        </view>
        <view class="empyt" wx:else>
          <t-empty icon="folder-open" description="暂无数据" font-size="80" />
        </view>
      </view>
    </view>
    <view class="home-page-tabs">
      <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick">
        <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
      </t-tabs>
    </view>
    <view class="listBox2">
      <view wx:if="{{booksList.length > 0}}" class="flex">
        <view wx:for="{{booksList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
          <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
      <view class="tabCardPublic">
        <view class="icon">
          <t-image src="/static/images/home/tushufuwu@2x.png" mode="heightFix" class="iconImage" />
        </view>
        <view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
          <text class="more">更多</text>
          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
        </view>
      </view>
      <view class="home-page-tabs">
        <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick">
          <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
        </t-tabs>
      </view>
      <view class="listBox2">
        <view wx:if="{{booksList.length > 0}}" class="flex">
          <view wx:for="{{booksList}}" 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">
                <image src="{{item.icon}}" mode="aspectFill" class="img" />
              </view>
              <view class="body-info">
                <view class="name">{{item.name}}</view>
                <view class="author">{{item.author}}</view>
              </view>
            </view>
          </view>
        </view>
        <view class="empyt" wx:else>
          <t-empty icon="folder-open" description="暂无数据" font-size="80" />
        </view>
      </view>
      <view class="tabCardPublic">
        <view class="icon">
          <t-image src="/static/images/home/shuziyuedu1@2x.png" mode="heightFix" class="iconImage" />
        </view>
        <view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex">
          <text class="more">更多</text>
          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
        </view>
      </view>
      <view class="listBox2 flex">
        <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
          <view class="listItem">
            <view class="specialSubject-img">
              <image src="{{item.icon}}" mode="aspectFill" class="img" />
            </view>
@@ -121,86 +143,65 @@
          </view>
        </view>
      </view>
      <view class="empyt" wx:else>
        <t-empty icon="folder-open" description="暂无数据" font-size="80" />
      </view>
    </view>
    <view class="tabCardPublic">
      <view class="icon">
        <t-image src="/static/images/home/shuziyuedu1@2x.png" mode="heightFix" class="iconImage" />
      </view>
      <view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex">
        <text class="more">更多</text>
        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
      </view>
    </view>
    <view class="listBox2 flex">
      <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
        <view class="listItem">
          <view class="specialSubject-img">
            <image src="{{item.icon}}" mode="aspectFill" class="img" />
          </view>
          <view class="body-info">
            <view class="name">{{item.name}}</view>
            <view class="author">{{item.author}}</view>
          </view>
      <view class="tabCardPublic">
        <view class="icon">
          <t-image src="/static/images/home/shuzijiaocai1@2x.png" mode="heightFix" class="iconImage" />
        </view>
        <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex">
          <text class="more">更多</text>
          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
        </view>
      </view>
    </view>
    <view class="tabCardPublic">
      <view class="icon">
        <t-image src="/static/images/home/shuzijiaocai1@2x.png" mode="heightFix" class="iconImage" />
      </view>
      <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex">
        <text class="more">更多</text>
        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
      </view>
    </view>
    <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">
            <view class="specialSubject-img">
              <image src="{{item.icon}}" mode="aspectFill" class="img" />
            </view>
            <view class="body-info">
              <view class="name">{{item.name}}</view>
              <view class="introduction">{{item.description}}</view>
              <view class="author">{{item.author}}</view>
              <view class="priceBox flex jc-sb">
                <text class="price" wx:if="{{item.price == 0}}">免费</text>
                <text class="price" wx:if="{{item.price !== 0}}">¥{{item.price}}</text>
                <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
      <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">
              <view class="specialSubject-img">
                <image src="{{item.icon}}" mode="aspectFill" class="img" />
              </view>
              <view class="body-info">
                <view class="name">{{item.name}}</view>
                <view class="introduction">{{item.description}}</view>
                <view class="author">{{item.author}}</view>
                <view class="priceBox flex jc-sb">
                  <text class="price" wx:if="{{item.price == 0}}">免费</text>
                  <text class="price" wx:if="{{item.price !== 0}}">¥{{item.price}}</text>
                  <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
                </view>
              </view>
            </view>
          </view>
        </view>
        <view class="empyt" wx:else>
          <t-empty icon="folder-open" description="暂无数据" font-size="80" />
        </view>
      </view>
      <view class="empyt" wx:else>
        <t-empty icon="folder-open" description="暂无数据" font-size="80" />
      <view class="tabCardPublic">
        <view class="icon">
          <t-image src="/static/images/home/paihangbang@2x.png" mode="heightFix" class="iconImage" />
        </view>
      </view>
    </view>
    <view class="tabCardPublic">
      <view class="icon">
        <t-image src="/static/images/home/paihangbang@2x.png" mode="heightFix" class="iconImage" />
      </view>
    </view>
    <view class="rankingList">
      <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
        <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">
              <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" />
              <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else />
            </view>
            <view class="body-info">
              <view class="name">{{item.name}}</view>
              <view class="author">{{item.author}}</view>
      <view class="rankingList">
        <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
          <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">
                <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" />
                <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else />
              </view>
              <view class="body-info">
                <view class="name">{{item.name}}</view>
                <!-- <view class="author">{{item.author}}</view> -->
              </view>
            </view>
          </view>
        </view>
      </scroll-view>
        </scroll-view>
      </view>
    </view>
    <load-more list-is-empty="{{!goodsList.length}}" status="{{goodsListLoadStatus}}" bind:retry="onReTry" />
    <t-toast id="t-toast" />
  </view>
  <t-toast id="t-toast" />
  <<<<<<< Updated upstream <t-toast id="t-toast" />
  =======
  >>>>>>> Stashed changes
</view>
pages/home/home.wxss
@@ -3,6 +3,12 @@
  padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx);
}
.container {
  width: 100vw;
  position: relative;
  max-height: calc(100vh - env(safe-area-inset-bottom));
}
.background {
  width: 100%;
  position: fixed;
@@ -80,6 +86,7 @@
  margin-top: 20rpx;
  display: block;
  padding: 0 24rpx;
  padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx);
}
.tabCardPublic {
@@ -257,7 +264,6 @@
.listBox2 .author {
  height: 28rpx;
  color: #333333;
  font-weight: bold;
  line-height: 30rpx;
  display: -webkit-box;
  margin-bottom: 10rpx;
@@ -330,7 +336,7 @@
.srcolbox {
  width: 100%;
  height: 480rpx;
  height: 420rpx;
  white-space: nowrap;
}
@@ -350,15 +356,14 @@
  padding: 20rpx 0;
}
.rankingList .author {
  height: 30rpx;
.rankingList .name {
  height: 80rpx;
  width: 188rpx;
  color: #333333;
  font-weight: bold;
  line-height: 30rpx;
  display: -webkit-box;
  margin-bottom: 10rpx;
  -webkit-box-orient: vertical;
  -webkit-line-clamp: 1;
  overflow: hidden;
  text-overflow: ellipsis;
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
}
pages/personalCenter/index.wxss
@@ -12,7 +12,7 @@
  height: 80rpx;
  z-index: 3;
  text-align: center;
  padding-top: 110rpx;
  padding-top: 60rpx;
  font-size: 36rpx;
}
@@ -37,6 +37,7 @@
.content-wrapper {
  position: relative;
  padding: 30rpx;
  padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx);
}
.topBox {
pages/testLogin/index.js
@@ -40,6 +40,9 @@
          icon: "error",
          duration: 2000
        })
        this.setData({
          loading: false
        })
      }
    });
  },