From 3714621173c606c4c58439ed8941100ce9ddea14 Mon Sep 17 00:00:00 2001
From: Codex Assistant <codex@example.com>
Date: 星期三, 05 十一月 2025 15:10:49 +0800
Subject: [PATCH] bug
---
wx/pages/registration/registration.js | 249 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 198 insertions(+), 51 deletions(-)
diff --git a/wx/pages/registration/registration.js b/wx/pages/registration/registration.js
index 0c62a99..66dd0d5 100644
--- a/wx/pages/registration/registration.js
+++ b/wx/pages/registration/registration.js
@@ -10,6 +10,9 @@
activity: null,
loading: false,
userInfo: null, // 褰撳墠鐢ㄦ埛淇℃伅
+ // 鎶ュ悕鐘舵�佹帶鍒�
+ submitDisabled: false,
+ submitText: '鎻愪氦鎶ュ悕',
// 琛ㄥ崟鏁版嵁
formData: {
@@ -98,6 +101,9 @@
this.setData({
activityId: activityId
})
+ // 浼樺厛妫�鏌ユ姤鍚嶇姸鎬�
+ this.checkRegistrationStatus(activityId)
+ // 鍔犺浇娲诲姩淇℃伅
this.loadActivityInfo()
} else {
console.log('鉂� 娌℃湁鎺ユ敹鍒癮ctivityId鍙傛暟')
@@ -111,6 +117,14 @@
// 鍔犺浇鍖哄煙鏁版嵁
this.loadRegions()
+ },
+
+ onShow() {
+ // 杩斿洖鏈〉鏃跺埛鏂版姤鍚嶇姸鎬�
+ const { activityId } = this.data
+ if (activityId) {
+ this.checkRegistrationStatus(activityId)
+ }
},
// 鍔犺浇娲诲姩淇℃伅
@@ -215,41 +229,71 @@
},
// 鍔犺浇鐢ㄦ埛淇℃伅
- loadUserInfo() {
- const userInfo = app.globalData.userInfo
- console.log('馃攳 鍔犺浇鐢ㄦ埛淇℃伅鐢ㄤ簬鏄剧ず:', userInfo)
+ async loadUserInfo() {
+ console.log('馃攧 寮�濮嬪姞杞界敤鎴蜂俊鎭�')
+ const app = getApp()
+ let userInfo = app.globalData.userInfo
+ console.log('馃攳 鏈湴鐢ㄦ埛鏁版嵁:', JSON.stringify(userInfo, null, 2))
+
+ // 灏濊瘯浠庡悗绔幏鍙栧畬鏁寸殑鐢ㄦ埛淇℃伅
+ try {
+ const query = `
+ query GetUserProfile {
+ userProfile {
+ id
+ name
+ avatar
+ phone
+ gender
+ birthday
+ }
+ }
+ `
+
+ const result = await graphqlRequest(query)
+ if (result && result.userProfile) {
+ console.log('馃攳 浠庡悗绔幏鍙栫殑瀹屾暣鐢ㄦ埛鏁版嵁:', JSON.stringify(result.userProfile, null, 2))
+ userInfo = result.userProfile
+ // 鏇存柊鍏ㄥ眬鏁版嵁
+ app.globalData.userInfo = { ...app.globalData.userInfo, ...userInfo }
+ }
+ } catch (error) {
+ console.log('鈿狅笍 浠庡悗绔幏鍙栫敤鎴蜂俊鎭け璐ワ紝浣跨敤鏈湴鏁版嵁:', error)
+ }
if (userInfo) {
let displayUserInfo = {
name: userInfo.name || '',
phone: userInfo.phone || '',
- avatarUrl: userInfo.avatarUrl || '',
+ avatarUrl: userInfo.avatar || userInfo.avatarUrl || '',
gender: null,
- education: ''
+ education: '',
+ birthDate: ''
}
- // 濡傛灉鐢ㄦ埛鏈塒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
+ // 澶勭悊鎬у埆淇℃伅
+ if (userInfo.gender !== undefined && userInfo.gender !== null) {
+ console.log('馃懁 鍙戠幇鎬у埆瀛楁:', userInfo.gender, '绫诲瀷:', typeof userInfo.gender)
+ // 濡傛灉鏄瓧绗︿覆鏍煎紡锛岃浆鎹负鏁板瓧
+ if (typeof userInfo.gender === 'string') {
+ displayUserInfo.gender = userInfo.gender === 'MALE' ? 1 : 0 // 淇锛歁ALE=1(鐢�), FEMALE=0(濂�)
+ console.log('馃懁 澶勭悊鍚庣殑鎬у埆:', displayUserInfo.gender)
+ } else {
+ displayUserInfo.gender = parseInt(userInfo.gender)
}
}
- console.log('鉁� 璁剧疆鏄剧ず鐢ㄦ埛淇℃伅:', displayUserInfo)
+ // 澶勭悊鐢熸棩淇℃伅
+ if (userInfo.birthday || userInfo.birthDate) {
+ displayUserInfo.birthDate = userInfo.birthday || userInfo.birthDate
+ console.log('馃巶 鍙戠幇鐢熸棩瀛楁:', displayUserInfo.birthDate)
+ }
+
this.setData({
- userInfo: displayUserInfo
+ displayUserInfo: displayUserInfo
})
+
+ console.log('鉁� 鏈�缁� displayUserInfo:', JSON.stringify(displayUserInfo, null, 2))
} else {
console.log('鈿狅笍 鏈壘鍒扮敤鎴蜂俊鎭�')
}
@@ -257,6 +301,7 @@
// 棰勫～鍏呯敤鎴蜂俊鎭�
prefillUserInfo() {
+ const app = getApp()
const userInfo = app.globalData.userInfo
console.log('馃攳 棰勫～鍏呯敤鎴蜂俊鎭�:', userInfo)
@@ -264,30 +309,40 @@
const updateData = {
'formData.name': userInfo.name || '',
'formData.phone': userInfo.phone || '',
- 'formData.email': userInfo.email || ''
+ 'formData.email': userInfo.email || '',
+ 'formData.avatarUrl': userInfo.avatar || userInfo.avatarUrl || ''
}
- // 濡傛灉鐢ㄦ埛鏈塒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 ? '鐢�' : '濂�')
- }
+ // 澶勭悊鎬у埆淇℃伅 - 鐩存帴浠巙serInfo鑾峰彇
+ if (userInfo.gender !== undefined && userInfo.gender !== null) {
+ let genderValue, genderIndex
+ // 濡傛灉鏄瓧绗︿覆鏍煎紡锛岃浆鎹负鏁板瓧
+ if (typeof userInfo.gender === 'string') {
+ genderValue = userInfo.gender === 'MALE' ? 1 : 0 // 淇锛歁ALE=1(鐢�), FEMALE=0(濂�)
+ genderIndex = userInfo.gender === 'MALE' ? 0 : 1 // 鐣岄潰绱㈠紩锛�0=鐢凤紝1=濂�
+ } else {
+ genderValue = parseInt(userInfo.gender)
+ genderIndex = genderValue === 1 ? 0 : 1 // 鏁版嵁搴撳��1(鐢�)->鐣岄潰绱㈠紩0锛屾暟鎹簱鍊�0(濂�)->鐣岄潰绱㈠紩1
}
+ updateData['formData.gender'] = genderValue
+ updateData['genderIndex'] = genderIndex
+ console.log('馃懁 璁剧疆鎬у埆:', genderValue === 1 ? '鐢�' : '濂�', '鐣岄潰绱㈠紩:', genderIndex)
+ }
+
+ // 澶勭悊鐢熸棩淇℃伅 - 鐩存帴浠巙serInfo鑾峰彇
+ if (userInfo.birthday || userInfo.birthDate) {
+ const birthDate = userInfo.birthday || userInfo.birthDate
+ updateData['formData.birthDate'] = birthDate
+ console.log('馃巶 璁剧疆鐢熸棩:', birthDate)
}
console.log('鉁� 棰勫～鍏呮暟鎹�:', updateData)
+ console.log('馃柤锔� 璁剧疆澶村儚URL:', updateData['formData.avatarUrl'])
+
this.setData(updateData)
+ console.log('鉁� 鐢ㄦ埛淇℃伅棰勫～鍏呭畬鎴�')
} else {
- console.log('鈿狅笍 鏈壘鍒扮敤鎴蜂俊鎭紝鏃犳硶棰勫～鍏�')
+ console.log('鈿狅笍 鏈壘鍒扮敤鎴蜂俊鎭紝璺宠繃棰勫～鍏�')
}
},
@@ -324,9 +379,11 @@
// 鎬у埆閫夋嫨
onGenderChange(e) {
const index = e.detail.value
+ // 淇鎬у埆鏄犲皠锛歡enderOptions[0]='鐢�' 搴旇瀵瑰簲鏁版嵁搴撳��1锛実enderOptions[1]='濂�' 搴旇瀵瑰簲鏁版嵁搴撳��0
+ const genderValue = index === 0 ? 1 : 0 // 0(鐢�) -> 1, 1(濂�) -> 0
this.setData({
genderIndex: index,
- 'formData.gender': index
+ 'formData.gender': genderValue
})
},
@@ -907,23 +964,31 @@
success: (res) => {
wx.hideLoading()
if (res.statusCode === 200) {
+ // 鏍规嵁瀹為檯鏂囦欢鎵╁睍鍚嶇‘瀹氭枃浠剁被鍨�
+ const fileName = attachment.name || ''
+ const fileExt = fileName.split('.').pop().toLowerCase()
const fileTypeMap = {
- 'word': 'doc',
- 'excel': 'xls',
- 'ppt': 'ppt'
+ 'doc': 'doc',
+ 'docx': 'docx',
+ 'xls': 'xls',
+ 'xlsx': 'xlsx',
+ 'ppt': 'ppt',
+ 'pptx': 'pptx'
}
wx.openDocument({
filePath: res.tempFilePath,
- fileType: fileTypeMap[fileType] || 'doc',
+ fileType: fileTypeMap[fileExt] || 'doc',
success: () => {
console.log('鏂囨。鎵撳紑鎴愬姛')
},
fail: (err) => {
console.error('鏂囨。鎵撳紑澶辫触:', err)
- wx.showToast({
- title: '鏂囨。鎵撳紑澶辫触',
- icon: 'none'
+ wx.showModal({
+ title: '鎵撳紑澶辫触',
+ content: '鏂囨。鎵撳紑澶辫触锛屽彲鑳芥槸鏂囦欢鏍煎紡涓嶆敮鎸佹垨鏂囦欢鎹熷潖',
+ showCancel: false,
+ confirmText: '纭畾'
})
}
})
@@ -1069,8 +1134,8 @@
errors.name = '璇疯緭鍏ュ鍚�';
}
- if (!formData.phone.trim()) {
- errors.phone = '璇疯緭鍏ユ墜鏈哄彿';
+ if (!formData.phone || !formData.phone.trim()) {
+ errors.phone = '璇峰厛鎺堟潈鑾峰彇鎵嬫満鍙�';
} else if (!/^1[3-9]\d{9}$/.test(formData.phone)) {
errors.phone = '璇疯緭鍏ユ纭殑鎵嬫満鍙�';
}
@@ -1158,12 +1223,31 @@
async onSubmit() {
if (this.data.isSubmitting) return
+ if (this.data.submitDisabled) {
+ // 绂佺敤鎬佺洿鎺ユ嫤鎴偣鍑�
+ wx.showToast({
+ title: this.data.submitText,
+ icon: 'none'
+ })
+ return
+ }
// 琛ㄥ崟楠岃瘉
if (!this.validateForm()) {
wx.showToast({
title: '璇锋鏌ヨ〃鍗曚俊鎭�',
icon: 'none'
+ })
+ return
+ }
+
+ // 棰濆妫�鏌ワ細纭繚蹇呴』鎺堟潈鐢佃瘽鍙风爜
+ if (!this.data.formData.phone || !this.data.formData.phone.trim()) {
+ wx.showModal({
+ title: '闇�瑕佹巿鏉冩墜鏈哄彿',
+ content: '鏍规嵁骞冲彴瑙勫畾锛屽繀椤绘巿鏉冩墜鏈哄彿鐮佹墠鑳芥姤鍚嶅弬璧涖�傝鍏堣幏鍙栨墜鏈哄彿鐮佹巿鏉冦��',
+ showCancel: false,
+ confirmText: '鎴戠煡閬撲簡'
})
return
}
@@ -1205,6 +1289,16 @@
activityPlayerId: result.activityPlayerId
})
+ // 绗笁姝ワ細鎶ュ悕鎴愬姛鍚庡己鍒惰皟鐢╳xlogin鑾峰彇鏂扮殑JWT token
+ console.log('馃摫 鎶ュ悕鎴愬姛锛屽紑濮嬪己鍒惰皟鐢╳xlogin鑾峰彇鏂扮殑JWT token')
+ try {
+ await app.login()
+ console.log('鉁� 鎶ュ悕鎴愬姛鍚巜xlogin璋冪敤鎴愬姛锛屽凡鑾峰彇鏂扮殑JWT token')
+ } catch (wxLoginError) {
+ console.error('鉂� 鎶ュ悕鎴愬姛鍚巜xlogin璋冪敤澶辫触:', wxLoginError)
+ // wxlogin澶辫触涓嶅奖鍝嶆姤鍚嶆垚鍔熺殑鎻愮ず锛屽彧璁板綍閿欒
+ }
+
wx.showToast({
title: '鎶ュ悕鎴愬姛',
icon: 'success'
@@ -1219,9 +1313,11 @@
} catch (error) {
console.error('鎻愪氦澶辫触:', error)
- wx.showToast({
- title: error.message || '鎻愪氦澶辫触锛岃閲嶈瘯',
- icon: 'none'
+ wx.showModal({
+ title: '鎻愪氦澶辫触',
+ content: error.message || '鎻愪氦澶辫触锛岃閲嶈瘯',
+ showCancel: false,
+ confirmText: '鎴戠煡閬撲簡'
})
} finally {
this.setData({ isSubmitting: false })
@@ -1418,6 +1514,57 @@
}
},
+ // 妫�鏌ュ綋鍓嶆椿鍔ㄧ殑鎶ュ悕鐘舵�侊紝杩涘叆椤甸潰鏃惰皟鐢�
+ async checkRegistrationStatus(activityId) {
+ try {
+ // GraphQL 鏌ヨ鏈�鏂版姤鍚嶇姸鎬侊紙鍚庣杩斿洖鏈�鏂颁竴鏉¤褰曪級
+ const query = `
+ query GetPlayerRegistrationState($activityId: ID!) {
+ getPlayerRegistrationState(activityId: $activityId) {
+ id
+ status
+ registrationTime
+ reviewStatus
+ reviewComment
+ }
+ }
+ `
+ const res = await app.graphqlRequest(query, { activityId: parseInt(activityId) })
+ console.log('馃煢 鎶ュ悕鐘舵�佹煡璇㈢粨鏋滃師濮�:', res)
+
+ // 鍏煎澶氱杩斿洖缁撴瀯
+ const dataRoot = res?.getPlayerRegistrationState
+ || res?.playerRegistration
+ || res?.data?.getPlayerRegistrationState
+ || res?.data?.playerRegistration
+
+ let submitDisabled = false
+ let submitText = '鎻愪氦鎶ュ悕'
+
+ if (dataRoot && dataRoot.status !== undefined && dataRoot.status !== null) {
+ const statusNum = Number(dataRoot.status)
+ console.log('馃煢 瑙ｆ瀽鍒版姤鍚嶇姸鎬�:', statusNum)
+ if (statusNum === 1) {
+ submitDisabled = true
+ submitText = '宸茬粡鎶ュ悕'
+ } else if (statusNum === 0) {
+ submitDisabled = true
+ submitText = '绛夊緟瀹℃牳'
+ } else {
+ submitDisabled = false
+ submitText = '鎻愪氦鎶ュ悕'
+ }
+ } else {
+ console.log('馃煢 鏈壘鍒版姤鍚嶈褰曟垨鐘舵�侊紝鍏佽鎻愪氦')
+ }
+
+ this.setData({ submitDisabled, submitText })
+ } catch (err) {
+ console.warn('鈿狅笍 鎶ュ悕鐘舵�佹煡璇㈠け璐ワ紝鍏佽鐢ㄦ埛鎻愪氦:', err)
+ this.setData({ submitDisabled: false, submitText: '鎻愪氦鎶ュ悕' })
+ }
+ },
+
// 鑾峰彇鏂囦欢鎵╁睍鍚�
getFileExtension(fileName) {
if (!fileName) return ''
--
Gitblit v1.8.0