litian
2024-03-29 437634b6c3f4fb1fd05a64f62feb0d8501e0360d
yangshi
10个文件已修改
77 ■■■■ 已修改文件
custom-tab-bar/index.wxss 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/sampleBookList/applicationForm/index.json 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/sampleBookList/applicationForm/index.wxml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/sampleBookList/applicationForm/index.wxss 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/sampleBookList/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/sampleBookList/index.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packageDomain/pages/teacherCertification/index.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packagePersonal/pages/feedBack/index.wxss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
packagePersonal/pages/userSetting/index.js 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
custom-tab-bar/index.wxss
@@ -14,6 +14,7 @@
  padding-bottom: env(safe-area-inset-bottom);
  background-color: #fff;
  /* opacity: 1; */
  z-index: 1100;
}
.tabItem {
packageDomain/pages/sampleBookList/applicationForm/index.json
@@ -7,5 +7,6 @@
    "t-cascader": "tdesign-miniprogram/cascader/cascader",
    "t-swipe-cell": "tdesign-miniprogram/swipe-cell/swipe-cell",
    "t-empty": "tdesign-miniprogram/empty/empty"
  }
  },
  "disableScroll": true
}
packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -1,9 +1,10 @@
<view class="container">
  <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick">
  <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick" show-bottom-line="false">
    <t-tab-panel label="纸质样书" value="0" />
    <t-tab-panel label="电子样书" value="1" />
  </t-tabs>
  <view class="page-content">
    <view class="con-bg"></view>
    <view class="content">
      <view class="bookListBox">
        <view class="tips">
packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -12,9 +12,15 @@
  margin-top: -30rpx;
}
.con-bg {
  height: 30rpx;
  background: #fff;
  width: 100%;
}
.content {
  box-sizing: border-box;
  height: calc(100vh - env(safe-area-inset-bottom) - 86rpx);
  height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
  overflow-y: auto;
}
packageDomain/pages/sampleBookList/index.js
@@ -278,6 +278,7 @@
        'stairList.options': options,
        'stairList.value': this.data.stairCode,
      });
      console.log(this.data.stairList.options)
    });
  },
  // 获取一级分类下二级分类
@@ -313,6 +314,7 @@
      this.setData({
        'secondList.value': second
      })
      console.log(this.data.secondList.options)
    });
  },
  // 获取重点项目
packageDomain/pages/sampleBookList/index.wxml
@@ -14,8 +14,8 @@
        <view class="srcolbox">
          <t-dropdown-menu>
            <t-dropdown-item label="总分类" options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" />
            <t-dropdown-item label="一级" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" disabled="{{assortCheck.code == ''}}" />
            <t-dropdown-item label=" 二级" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" disabled="{{stairCode == '' || assortCheck.code == ''}}" />
            <t-dropdown-item label="一级" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" disabled="{{assortCheck.code == '' || stairList.options.length == 0}}" />
            <t-dropdown-item label=" 二级" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}" />
          </t-dropdown-menu>
        </view>
        <!-- </scroll-view> -->
packageDomain/pages/teacherCertification/index.wxml
@@ -5,7 +5,7 @@
      <view class="baseInfoBox">
        <view class="from-item">
          <view class="label"> 当前状态: </view>
          <view class="stateBox">
          <view class="stateBox" wx:if="{{teacherInfo.schoolName}}">
            <text class="wait" wx:if="{{teacherInfo.state == 'WaitAudit'}}">等待审核</text>
            <text class="yes" wx:if="{{teacherInfo.state == 'Normal'}}">已认证</text>
            <text class="no" wx:if="{{teacherInfo.state == 'Reject'}}">已驳回</text>
packagePersonal/pages/feedBack/index.wxss
@@ -1,5 +1,5 @@
page {
  background-color: #f0f2f5;
  background-color: #f0f2f5 !important;
}
.container {
packagePersonal/pages/userSetting/index.js
@@ -97,7 +97,9 @@
  },
  //修改用户类型
  editUserInfo(e) {
    let { info } = e.currentTarget.dataset
    let {
      info
    } = e.currentTarget.dataset
    if (!this.data.userInfoBox) {
      this.setData({
        userInfoBox: true,
@@ -154,13 +156,14 @@
                      'userInfoForm.icon': app.config.requestCtx + `/file/GetPreViewImage?md5=` + e,
                    });
                    let userTypeInfo = {
                      requests: [
                        {
                          data: JSON.stringify({ nickName: that.data.userInfo.nickName, icon: that.data.userInfoForm.icon }),
                      "requests": [{
                        data: JSON.stringify({
                          nickName: that.data.userInfo.nickName,
                          icon: that.data.userInfoForm.icon
                        }),
                          name: '用户昵称头像',
                          type: 'nickName'
                        }
                      ]
                      }]
                    }
                    app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
                      if (res) {
@@ -194,7 +197,9 @@
  },
  //输入手机号
  onPhoneInput(e) {
    const { phoneError } = this.data;
    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({
@@ -205,7 +210,9 @@
  },
  onEmailInput(e) {
    const { emailError } = this.data;
    const {
      emailError
    } = this.data;
    const isPhoneNumber = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/.test(e.detail.value);
    if (emailError === isPhoneNumber) {
      this.setData({
@@ -328,13 +335,14 @@
  confirmInfo() {
    if (this.data.editType == 'nickName') {
      let userTypeInfo = {
        requests: [
          {
            data: JSON.stringify({ nickName: this.data.userInfoForm.nickName, icon: this.data.userInfo.icon }),
        "requests": [{
          data: JSON.stringify({
            nickName: this.data.userInfoForm.nickName,
            icon: this.data.userInfo.icon
          }),
            name: '用户昵称头像',
            type: 'nickName'
          }
        ]
        }]
      }
      app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
        if (res) {
pages/home/home.js
@@ -520,8 +520,24 @@
  // 监听滚动条
  onScroll(e) {
    console.log(e)
    this.setData({
      isWhite: e.detail.scrollTop > 20 ? true : false
      isWhite: true
    })
    if (e.detail.scrollTop == 0) {
      this.setData({
        isWhite: false
      })
    }
    // this.setData({
    //   isWhite: e.detail.scrollTop > 20 ? true : false
    // })
  },
  onScrollToTop(e) {
    this.setData({
      isWhite: e.detail.scrollTop > 50 ? true : false
    })
  },
  onRetrievalPage() {