From f00c1cca98455a036548672d28e7e8ad13729a21 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 11 四月 2024 21:57:27 +0800
Subject: [PATCH] 问题修改
---
pages/personalCenter/index.wxml | 2
pages/home/home.js | 22 ++++--
packageDomain/pages/sampleBookList/index.wxss | 2
pages/bindInfo/index.js | 17 ++++-
pages/personalCenter/index.wxss | 15 +++-
pages/personalCenter/components/user-center-card/index.json | 1
packageDomain/pages/sampleBookList/index.js | 3 +
pages/personalCenter/components/user-center-card/index.wxml | 19 ++++-
pages/personalCenter/components/user-center-card/index.wxss | 37 ++++++++---
pages/personalCenter/index.js | 23 +++++--
packagePersonal/pages/userSetting/index.js | 4
11 files changed, 102 insertions(+), 43 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 6817ded..b86a4ca 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -348,6 +348,9 @@
// 鑾峰彇鍥句功鍒楄〃
getBookList(isReachBottom) {
let that = this;
+ this.setData({
+ skeletonLoding: true
+ })
let sort;
let pathObj = {};
if (that.data.pathList.length) {
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index c73292b..9da69cb 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -198,7 +198,7 @@
.book-box {
box-sizing: border-box;
- width: calc(100%/2 - 10rpx);
+ width: calc(100%/2 - 12rpx);
margin-right: 20rpx;
display: flex;
flex-direction: column;
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 9752870..c09c9fa 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -75,8 +75,8 @@
} else if (WeChatInfo) {
defaultUser = {
...WeChatInfo,
- nickName: nickNameData ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
- icon: JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
+ nickName: nickNameData && JSON.parse(nickNameData.data).nickName ? JSON.parse(nickNameData.data).nickName : WeChatInfo.name,
+ icon: nickNameData && JSON.parse(nickNameData.data).icon ? JSON.parse(nickNameData.data).icon : WeChatInfo.icon,
userId: res.userId,
phoneNumber: phoneInfo?.credential,
Email: emailInfo?.credential
diff --git a/pages/bindInfo/index.js b/pages/bindInfo/index.js
index 322d512..1fcccf6 100644
--- a/pages/bindInfo/index.js
+++ b/pages/bindInfo/index.js
@@ -1,5 +1,7 @@
// pages/index/bindInfo/index.js
-import { setSessionGuid } from "../../assets/js/userAction"
+import {
+ setSessionGuid
+} from "../../assets/js/userAction"
const app = getApp();
Page({
@@ -74,6 +76,7 @@
},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
+ let that = this;
app.MG.identity.getCurrentAppUser().then(res => {
// 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
if (res) {
@@ -93,9 +96,15 @@
}
wx.setStorageSync(app.config.userInfoKey, JSON.stringify(defaultUser));
}
- wx.navigateTo({
- url: this.data.redirectPage ? this.data.redirectPage : '/pages/home/home'
- })
+ if (that.data.redirectPage == "" || that.data.redirectPage == "/pages/home/home" || that.data.redirectPage == "/pages/bookServices/assort/index" || that.data.redirectPage == "/pages/study/index" || that.data.redirectPage == "/pages/cart/index" || that.data.redirectPage == "/pages/personalCenter/index") {
+ wx.switchTab({
+ url: that.data.redirectPage != "" ? that.data.redirectPage : '/pages/home/home'
+ })
+ } else {
+ wx.navigateTo({
+ url: that.data.redirectPage
+ })
+ }
});
},
diff --git a/pages/home/home.js b/pages/home/home.js
index 1522c7c..4b721d9 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -11,6 +11,7 @@
barHeight: '',
navBarHeight: '',
searchVal: '',
+ scoll: false,
isWhite: false,
userInfo: {},
tabList: [], //鐩綍
@@ -589,17 +590,22 @@
// 鐩戝惉婊氬姩鏉�
onScroll(e) {
- this.setData({
- isWhite: true
- })
- this.setData({
- isWhite: e.detail.scrollTop > 20 ? true : false
- })
+ if (this.data.scoll) {
+ if (e.detail.scrollTop < 20) {
+ this.data.scoll = false
+ this.isChange(false);
+ }
+ } else {
+ if (e.detail.scrollTop > 20) {
+ this.data.scoll = true
+ this.isChange(true);
+ }
+ }
},
- onScrollToTop(e) {
+ isChange(data) {
this.setData({
- isWhite: e.detail.scrollTop > 50 ? true : false
+ isWhite: data
})
},
diff --git a/pages/personalCenter/components/user-center-card/index.json b/pages/personalCenter/components/user-center-card/index.json
index e169f6f..7d4aa76 100644
--- a/pages/personalCenter/components/user-center-card/index.json
+++ b/pages/personalCenter/components/user-center-card/index.json
@@ -2,6 +2,7 @@
"component": true,
"usingComponents": {
"t-icon": "tdesign-miniprogram/icon/icon",
+ "t-image": "tdesign-miniprogram/image/image",
"t-avatar": "tdesign-miniprogram/avatar/avatar"
}
}
\ No newline at end of file
diff --git a/pages/personalCenter/components/user-center-card/index.wxml b/pages/personalCenter/components/user-center-card/index.wxml
index bfac078..3b3b5da 100644
--- a/pages/personalCenter/components/user-center-card/index.wxml
+++ b/pages/personalCenter/components/user-center-card/index.wxml
@@ -2,7 +2,10 @@
<!-- 鏈櫥褰曠殑鎯呭喌 -->
<block wx:if="{{currAuthStep === AuthStepType.ONE}}">
<view class="user-center-card__header">
- <t-avatar image="{{userInfo.avatarUrl || defaultAvatarUrl}}" class="user-center-card__header__avatar" />
+ <!-- <t-avatar image="{{userInfo.avatarUrl || defaultAvatarUrl}}" class="user-center-card__header__avatar" /> -->
+ <view class="user-center-card__header__avatar">
+ <t-image src="{{userInfo.icon || defaultAvatarUrl}}" mode="aspectFill" class="img" />
+ </view>
<view>
<view class="user-center-card__header__name">{{'璇风櫥褰�'}}</view>
</view>
@@ -15,11 +18,14 @@
<!-- 宸茬櫥褰曚絾鏈巿鏉冪敤鎴蜂俊鎭儏鍐� -->
<block wx:if="{{currAuthStep === AuthStepType.TWO}}">
<view class="user-center-card__header">
- <t-avatar image="{{userInfo.icon || defaultAvatarUrl}}" class="user-center-card__header__avatar" />
+ <!-- <t-avatar image="{{userInfo.icon || defaultAvatarUrl}}" class="user-center-card__header__avatar" mode="aspectFill" t-class="avatar" /> -->
+ <view class="user-center-card__header__avatar">
+ <t-image src="{{userInfo.icon || defaultAvatarUrl}}" mode="aspectFill" class="img" />
+ </view>
<view>
<view class="user-center-card__header__name">{{userInfo.nickName || '寰俊鐢ㄦ埛'}}</view>
<view class="userTypeBox">
- <text>{{userInfo.userType}}</text>
+ <text class="txt" wx:if="{{userInfo.userType}}">{{userInfo.userType}}</text>
<text bindtap="editUserType" wx:if="{{userInfo.userType}}" class="edit">淇敼</text>
<text bindtap="editUserType" wx:else class="edit">璁剧疆鐢ㄦ埛绫诲瀷</text>
</view>
@@ -35,11 +41,14 @@
<!-- 宸茬櫥褰曚笖宸茬粡鎺堟潈鐢ㄦ埛淇℃伅鐨勬儏鍐� -->
<block wx:if="{{currAuthStep === AuthStepType.THREE}}">
<view class="user-center-card__header">
- <t-avatar t-class="avatar" mode="aspectFill" class="user-center-card__header__avatar" image="{{userInfo.icon || defaultAvatarUrl}}" />
+ <!-- <t-avatar t-class="avatar" mode="aspectFill" class="user-center-card__header__avatar" image="{{userInfo.icon || defaultAvatarUrl}}" /> -->
+ <view class="user-center-card__header__avatar">
+ <t-image src="{{userInfo.icon || defaultAvatarUrl}}" mode="aspectFill" class="img" />
+ </view>
<view>
<view class="user-center-card__header__name">{{userInfo.nickName || '寰俊鐢ㄦ埛'}}</view>
<view class="userTypeBox">
- <text>{{userInfo.userType}}</text>
+ <text class="txt" wx:if="{{userInfo.userType}}">{{userInfo.userType}}</text>
<text bindtap="editUserType" wx:if="{{userInfo.userType}}" class="edit">淇敼</text>
<text bindtap="editUserType" wx:else class="edit">璁剧疆鐢ㄦ埛绫诲瀷</text>
</view>
diff --git a/pages/personalCenter/components/user-center-card/index.wxss b/pages/personalCenter/components/user-center-card/index.wxss
index d618c8b..2d2c798 100644
--- a/pages/personalCenter/components/user-center-card/index.wxss
+++ b/pages/personalCenter/components/user-center-card/index.wxss
@@ -6,28 +6,36 @@
}
.user-center-card__header {
- margin-top: 160rpx;
+ margin-top: 120rpx;
margin-bottom: 30rpx;
margin-left: 20rpx;
height: 120rpx;
- line-height: 48rpx;
+ /* line-height: 48rpx; */
display: flex;
justify-content: flex-start;
- align-items: center;
+ /* align-items: center; */
color: #333;
position: relative;
}
.user-center-card__header__avatar {
- width: 120rpx;
- height: 120rpx;
- border-radius: 48rpx;
+ width: 120rpx !important;
+ height: 120rpx !important;
+ border-radius: 50%;
overflow: hidden;
}
+.user-center-card__header__avatar .img {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+}
+
+
+
.user-center-card__header__name {
- font-size: 36rpx;
- line-height: 48rpx;
+ font-size: 38rpx;
+ line-height: 56rpx;
color: #333;
font-weight: bold;
margin-left: 24rpx;
@@ -37,11 +45,15 @@
.userTypeBox {
margin-left: 24rpx;
font-size: 28rpx;
- padding-top: 15rpx;
+ padding-top: 18rpx;
+}
+
+.txt {
+ margin-right: 20rpx;
}
.edit {
- margin-left: 20rpx;
+
color: #ff6d00;
}
@@ -61,11 +73,14 @@
.setting {
margin-left: auto;
display: flex;
- align-items: center;
+ padding-top: 8rpx;
+ /* align-items: center; */
}
.setting .img {
height: 34rpx;
width: 34rpx;
margin-right: 10rpx;
+ margin-top: 8rpx;
+
}
\ No newline at end of file
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 8301703..c756a91 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -102,6 +102,7 @@
data: {
barHeight: '',
navBarHeight: '',
+ scoll: false,
isWhite: false,
userInfo: {},
currAuthStep: 1,
@@ -346,15 +347,23 @@
},
onScroll(e) {
+ if (this.data.scoll) {
+ if (e.detail.scrollTop < 20) {
+ this.data.scoll = false
+ this.isChange(false);
+ }
+ } else {
+ if (e.detail.scrollTop > 20) {
+ this.data.scoll = true
+ this.isChange(true);
+ }
+ }
+ },
+
+ isChange(data) {
this.setData({
- isWhite: e.detail.scrollTop > 10 ? true : false
+ isWhite: data
})
- const {
- scrollTop
- } = e.detail;
- this.setData({
- scrollTop
- });
},
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index d7d9d6f..20dc6cc 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,5 +1,5 @@
<view>
- <t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+ <t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
<text class="text">涓汉涓績</text>
diff --git a/pages/personalCenter/index.wxss b/pages/personalCenter/index.wxss
index 88ce583..f2c3d42 100644
--- a/pages/personalCenter/index.wxss
+++ b/pages/personalCenter/index.wxss
@@ -34,7 +34,7 @@
.content-wrapper {
position: relative;
- padding: 30rpx;
+ padding: 20rpx 30rpx;
padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
}
@@ -90,8 +90,9 @@
}
.domainBox .title {
+ color: #333;
font-weight: bold;
- padding: 30rpx;
+ padding: 30rpx 30rpx 0rpx 30rpx;
}
.domainList {
@@ -99,7 +100,6 @@
display: flex;
flex-wrap: wrap;
justify-content: center;
- padding-bottom: 30rpx;
}
.domainList1 {
@@ -119,7 +119,14 @@
width: 160rpx;
min-width: 160rpx;
flex-shrink: 0;
- padding: 30rpx 0;
+ padding: 40rpx 0;
+}
+
+.listItem:nth-child(5),
+.listItem:nth-child(6),
+.listItem:nth-child(7),
+.listItem:nth-child(8) {
+ padding-top: 10rpx !important;
}
.listItem .icon {
--
Gitblit v1.9.1