From cc91e6d563cf14608357e6ab8cf138614ce354c2 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Wed, 29 Jul 2026 17:09:44 +0800
Subject: [PATCH] 1
---
package2/IdleTrad/chat.vue | 7 +-
package2/IdleTrad/detail.vue | 15 ++-
package2/group/groupBuySingle.vue | 147 +++++++++++++++++-----
package2/login/login.vue | 30 ++++-
package2/myCenter/goodsList.vue | 30 +++--
package2/myCenter/myPost.vue | 21 +++-
package2/myCenter/partTimeJobRegister.vue | 44 +++++--
7 files changed, 239 insertions(+), 55 deletions(-)
diff --git a/package2/IdleTrad/chat.vue b/package2/IdleTrad/chat.vue
index ef18d42..d54846c 100644
--- a/package2/IdleTrad/chat.vue
+++ b/package2/IdleTrad/chat.vue
@@ -109,11 +109,8 @@
return this.isWant ? (this.goods.expectedPrice || 0) : (this.goods.price || 0)
},
peerName() {
- if (!this.goods || !this.session) return '校园同学'
- if (this.isWant) {
- return this.selfId == String(this.session.buyerId) ? '供货同学' : (this.goods.userName || '求购同学')
- }
- return this.selfId == String(this.session.sellerId) ? '买家同学' : (this.goods.userName || '卖家同学')
+ if (!this.goods) return '校园同学'
+ return this.goods.userName || (this.isWant ? '求购同学' : '卖家同学')
},
peerAvatar() {
return this.defaultAvatar
diff --git a/package2/IdleTrad/detail.vue b/package2/IdleTrad/detail.vue
index 89edcc1..2e089de 100644
--- a/package2/IdleTrad/detail.vue
+++ b/package2/IdleTrad/detail.vue
@@ -51,7 +51,7 @@
- 半径卖家已实名
+ {{goods.userName || (isWant ? '求购同学' : '半径卖家')}}已实名
{{goods.sellerOnlineStatus || '3天内在线'}}
线下面交
@@ -82,13 +82,13 @@
- 半径同学
+ {{reply.userName || '校园同学'}}
卖家
回复 {{reply.replyToUserName}}
：{{reply.content}}
@@ -199,7 +199,7 @@
showCommentInput: false,
commentSubmitting: false,
replyTarget: {},
- defaultAvatar: '',
+ defaultAvatar: '/static/images/img/songshu.png',
defaultShareImage: '/static/images/img/songshu.png',
currentUserId: uni.getStorageSync('id') || '',
currentImageIndex: 0,
@@ -391,6 +391,7 @@
const replyTarget = { ...(this.replyTarget || {}) }
const payload = {
goodsId: this.id,
+ ...this.getCachedUserProfile(),
content
}
if (replyTarget && replyTarget.id) {
@@ -552,6 +553,12 @@
uni.makePhoneCall({
phoneNumber: String(phone)
})
+ },
+ getCachedUserProfile() {
+ return {
+ userName: uni.getStorageSync('nickName') || uni.getStorageSync('nickname') || uni.getStorageSync('userName') || '',
+ userAvatar: uni.getStorageSync('avatar') || uni.getStorageSync('avatarUrl') || uni.getStorageSync('headimgurl') || ''
+ }
}
}
}
diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue
index 9cf55ea..6ade75e 100644
--- a/package2/group/groupBuySingle.vue
+++ b/package2/group/groupBuySingle.vue
@@ -404,7 +404,7 @@
-
+
-
-
@@ -662,7 +663,7 @@
-
+
.box1 {
+ margin-bottom: 16rpx;
+ }
+
+ .pay-option-card {
+ padding: 26rpx 36rpx;
+ }
+
.pay-countdown {
display: flex;
align-items: center;
justify-content: center;
- min-height: 54rpx;
+ min-height: 44rpx;
color: #586963;
font-size: 26rpx;
}
.pay-amount {
- margin-top: 8rpx;
+ margin-top: 2rpx;
text-align: center;
font-size: 30rpx;
font-weight: 800;
- line-height: 84rpx;
+ line-height: 70rpx;
color: #00231C;
}
.pay-amount text {
- font-size: 62rpx;
+ font-size: 56rpx;
}
.minimum-pay-tip {
@@ -4239,8 +4330,8 @@
}
.pay-fee-list {
- margin-top: 14rpx;
- padding: 18rpx 22rpx;
+ margin-top: 8rpx;
+ padding: 14rpx 20rpx;
border-radius: 22rpx;
background: #f8fbf9;
border: 1rpx solid #edf3f0;
@@ -4292,7 +4383,7 @@
}
.pay-refund-tip {
- margin-top: 16rpx;
+ margin-top: 10rpx;
text-align: center;
color: #f0441f;
font-size: 24rpx;
@@ -4302,13 +4393,13 @@
.pay-confirm-btn {
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
width: 90%;
- height: 100rpx;
+ height: 88rpx;
border-radius: 100rpx;
text-align: center;
font-size: 28rpx;
font-weight: 700;
- line-height: 100rpx;
- margin: 40rpx auto;
+ line-height: 88rpx;
+ margin: 24rpx auto 18rpx;
}
.popup-bottom-bar {
diff --git a/package2/login/login.vue b/package2/login/login.vue
index 6552a36..66fd02b 100644
--- a/package2/login/login.vue
+++ b/package2/login/login.vue
@@ -117,10 +117,11 @@
provider: 'weixin',
success(loginRes) {
that.getWechatProfile().then((profile) => {
+ that.cacheWechatProfile(profile)
that.tui.request('/user/login', 'post', {
jsCode: loginRes.code,
customId: that.customId,
- wechatName: profile.nickName || '半径里同学',
+ wechatName: profile.nickName || uni.getStorageSync('nickname') || '半径里同学',
userType: '2'
}, false, false).then((res) => {
that.loginLoading = false
@@ -165,6 +166,20 @@
})
})
},
+ cacheWechatProfile(profile = {}) {
+ const nickname = profile.nickName || profile.nickname || ''
+ const avatar = profile.avatarUrl || profile.avatar || ''
+ if (nickname) {
+ uni.setStorageSync('nickName', nickname)
+ uni.setStorageSync('nickname', nickname)
+ uni.setStorageSync('userName', nickname)
+ }
+ if (avatar) {
+ uni.setStorageSync('avatarUrl', avatar)
+ uni.setStorageSync('avatar', avatar)
+ uni.setStorageSync('headimgurl', avatar)
+ }
+ },
getPhoneNumber(e) {
if (this.phoneLoading) return
if (!e.detail.code) {
@@ -202,7 +217,18 @@
if (result.worker !== undefined) uni.setStorageSync('worker', result.worker)
uni.setStorageSync('wayValue', '0')
if (result.user) {
- uni.setStorageSync('nickname', result.user.nickname)
+ const nickname = result.user.nickname || uni.getStorageSync('nickname') || uni.getStorageSync('nickName') || ''
+ const avatar = result.user.avatar || uni.getStorageSync('avatar') || uni.getStorageSync('avatarUrl') || ''
+ if (nickname) {
+ uni.setStorageSync('nickName', nickname)
+ uni.setStorageSync('nickname', nickname)
+ uni.setStorageSync('userName', nickname)
+ }
+ if (avatar) {
+ uni.setStorageSync('avatarUrl', avatar)
+ uni.setStorageSync('avatar', avatar)
+ uni.setStorageSync('headimgurl', avatar)
+ }
uni.setStorageSync('id', result.user.id)
uni.setStorageSync('unionid', result.user.unionid)
uni.setStorageSync('miniProgramOpenid', result.user.miniProgramOpenid)
diff --git a/package2/myCenter/goodsList.vue b/package2/myCenter/goodsList.vue
index 5da9d5a..4a968dd 100644
--- a/package2/myCenter/goodsList.vue
+++ b/package2/myCenter/goodsList.vue
@@ -164,6 +164,8 @@