From f04f35b562760afbac0c477357e2a29f77aec3b9 Mon Sep 17 00:00:00 2001
From: lrj <owen.stl@gmail.com>
Date: 星期四, 02 十月 2025 13:51:47 +0800
Subject: [PATCH] fix: 修复评审次数重复显示问题
---
wx/pages/registration/registration.js | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/wx/pages/registration/registration.js b/wx/pages/registration/registration.js
index e797579..0c62a99 100644
--- a/wx/pages/registration/registration.js
+++ b/wx/pages/registration/registration.js
@@ -9,6 +9,7 @@
activityId: '',
activity: null,
loading: false,
+ userInfo: null, // 褰撳墠鐢ㄦ埛淇℃伅
// 琛ㄥ崟鏁版嵁
formData: {
@@ -101,6 +102,9 @@
} else {
console.log('鉂� 娌℃湁鎺ユ敹鍒癮ctivityId鍙傛暟')
}
+
+ // 鍔犺浇鐢ㄦ埛淇℃伅
+ this.loadUserInfo()
// 浠庡叏灞�鏁版嵁鑾峰彇鐢ㄦ埛淇℃伅棰勫～鍏�
this.prefillUserInfo()
@@ -210,15 +214,80 @@
}
},
+ // 鍔犺浇鐢ㄦ埛淇℃伅
+ loadUserInfo() {
+ const userInfo = app.globalData.userInfo
+ console.log('馃攳 鍔犺浇鐢ㄦ埛淇℃伅鐢ㄤ簬鏄剧ず:', userInfo)
+
+ if (userInfo) {
+ let displayUserInfo = {
+ name: userInfo.name || '',
+ phone: userInfo.phone || '',
+ avatarUrl: userInfo.avatarUrl || '',
+ gender: null,
+ education: ''
+ }
+
+ // 濡傛灉鐢ㄦ埛鏈塒layer淇℃伅锛屼紭鍏堜娇鐢≒layer鐨勮缁嗕俊鎭�
+ if (userInfo.player) {
+ console.log('馃搵 浣跨敤Player淇℃伅鏄剧ず:', userInfo.player)
+ displayUserInfo.name = userInfo.player.name || userInfo.name || ''
+ displayUserInfo.phone = userInfo.player.phone || userInfo.phone || ''
+ displayUserInfo.avatarUrl = userInfo.player.avatarUrl || userInfo.avatarUrl || ''
+
+ // 澶勭悊鎬у埆淇℃伅锛�0=鐢凤紝1=濂�
+ if (userInfo.player.gender !== undefined && userInfo.player.gender !== null) {
+ displayUserInfo.gender = parseInt(userInfo.player.gender)
+ }
+
+ // 澶勭悊瀛﹀巻淇℃伅
+ if (userInfo.player.education) {
+ displayUserInfo.education = userInfo.player.education
+ }
+ }
+
+ console.log('鉁� 璁剧疆鏄剧ず鐢ㄦ埛淇℃伅:', displayUserInfo)
+ this.setData({
+ userInfo: displayUserInfo
+ })
+ } else {
+ console.log('鈿狅笍 鏈壘鍒扮敤鎴蜂俊鎭�')
+ }
+ },
+
// 棰勫～鍏呯敤鎴蜂俊鎭�
prefillUserInfo() {
const userInfo = app.globalData.userInfo
+ console.log('馃攳 棰勫～鍏呯敤鎴蜂俊鎭�:', userInfo)
+
if (userInfo) {
- this.setData({
+ const updateData = {
'formData.name': userInfo.name || '',
'formData.phone': userInfo.phone || '',
'formData.email': userInfo.email || ''
- })
+ }
+
+ // 濡傛灉鐢ㄦ埛鏈塒layer淇℃伅锛屼紭鍏堜娇鐢≒layer鐨勮缁嗕俊鎭�
+ if (userInfo.player) {
+ console.log('馃搵 浣跨敤Player淇℃伅棰勫～鍏�:', userInfo.player)
+ updateData['formData.name'] = userInfo.player.name || userInfo.name || ''
+ updateData['formData.phone'] = userInfo.player.phone || userInfo.phone || ''
+
+ // 澶勭悊鎬у埆淇℃伅锛�0=鐢凤紝1=濂�
+ if (userInfo.player.gender !== undefined && userInfo.player.gender !== null) {
+ const genderIndex = parseInt(userInfo.player.gender)
+ if (genderIndex === 0 || genderIndex === 1) {
+ updateData['formData.gender'] = genderIndex
+ updateData['genderIndex'] = genderIndex
+ console.log('馃懁 璁剧疆鎬у埆:', genderIndex === 0 ? '鐢�' : '濂�')
+ }
+ }
+ }
+
+ console.log('鉁� 棰勫～鍏呮暟鎹�:', updateData)
+ this.setData(updateData)
+ } else {
+ console.log('鈿狅笍 鏈壘鍒扮敤鎴蜂俊鎭紝鏃犳硶棰勫～鍏�')
}
},
--
Gitblit v1.8.0