From 437634b6c3f4fb1fd05a64f62feb0d8501e0360d Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 29 三月 2024 16:03:20 +0800
Subject: [PATCH] yangshi
---
pages/home/home.js | 18 ++++++++
custom-tab-bar/index.wxss | 1
packageDomain/pages/sampleBookList/index.wxml | 4 +-
packageDomain/pages/teacherCertification/index.wxml | 2
packageDomain/pages/sampleBookList/applicationForm/index.json | 3 +
packageDomain/pages/sampleBookList/index.js | 2 +
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 8 +++
packagePersonal/pages/feedBack/index.wxss | 2
packagePersonal/pages/userSetting/index.js | 42 ++++++++++++--------
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 3 +
10 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index b6b71b6..a15f4a0 100644
--- a/custom-tab-bar/index.wxss
+++ b/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 {
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.json b/packageDomain/pages/sampleBookList/applicationForm/index.json
index 8f822aa..67b401a 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.json
+++ b/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
}
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index 99a28eb..88e03cb 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/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">
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index cdff08e..a49b424 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/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;
}
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 746250a..03844cf 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/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)
});
},
// 鑾峰彇閲嶇偣椤圭洰
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index a1573ea..d5999cb 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/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> -->
diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml
index 011e198..a08d60e 100644
--- a/packageDomain/pages/teacherCertification/index.wxml
+++ b/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>
diff --git a/packagePersonal/pages/feedBack/index.wxss b/packagePersonal/pages/feedBack/index.wxss
index d5408dd..a206379 100644
--- a/packagePersonal/pages/feedBack/index.wxss
+++ b/packagePersonal/pages/feedBack/index.wxss
@@ -1,5 +1,5 @@
page {
- background-color: #f0f2f5;
+ background-color: #f0f2f5 !important;
}
.container {
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index ef9ce44..eefb2a4 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/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 }),
- name: '鐢ㄦ埛鏄电О澶村儚',
- type: 'nickName'
- }
- ]
+ "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 }),
- name: '鐢ㄦ埛鏄电О澶村儚',
- type: 'nickName'
- }
- ]
+ "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) {
diff --git a/pages/home/home.js b/pages/home/home.js
index 58b5b7a..5122f72 100644
--- a/pages/home/home.js
+++ b/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() {
--
Gitblit v1.9.1