From 58d9f460b2f8c34430285115e2557d18333c5cab Mon Sep 17 00:00:00 2001
From: Codex Assistant <codex@example.com>
Date: 星期三, 08 十月 2025 14:16:55 +0800
Subject: [PATCH] feat: 修复Player实体phone字段数据冗余问题并优化小程序报名逻辑
---
wx/pages/index/index.js | 107 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 26 deletions(-)
diff --git a/wx/pages/index/index.js b/wx/pages/index/index.js
index 3b64423..cf405ea 100644
--- a/wx/pages/index/index.js
+++ b/wx/pages/index/index.js
@@ -32,6 +32,8 @@
onShow() {
console.log('棣栭〉鏄剧ず')
+ // 缁熶竴绯荤粺瀵艰埅鏍忔爣棰�
+ try { wx.setNavigationBarTitle({ title: '钃夋槗鍒�' }) } catch (e) {}
// 妫�鏌ョ櫥褰曠姸鎬�
if (!app.globalData.token) {
app.login()
@@ -160,7 +162,7 @@
},
// 鍔犺浇璧涗簨鍒楄〃
- loadActivities() {
+ loadActivities(isLoadMore = false) {
this.setData({ loading: true })
const { currentPage, pageSize, searchKeyword, filterStatus } = this.data
@@ -168,9 +170,21 @@
// 鍚嶇О鎼滅储鏉′欢
const nameFilter = searchKeyword || ""
+ // 鐘舵�佺瓫閫夋潯浠讹細灏嗗墠绔殑绛涢�夌姸鎬佽浆鎹负鍚庣鐨剆tate鍙傛暟
+ let stateFilter = null
+ if (filterStatus !== 'all') {
+ // 鏍规嵁filterStatus鏄犲皠鍒板搴旂殑state鍊�
+ const stateMapping = {
+ 'upcoming': 1, // 鍗冲皢寮�濮�
+ 'ongoing': 2, // 杩涜涓�
+ 'ended': 3 // 宸茬粨鏉�
+ }
+ stateFilter = stateMapping[filterStatus]
+ }
+
return app.graphqlRequest(`
- query getActivities($page: Int!, $size: Int!, $name: String) {
- activities(page: $page, size: $size, name: $name) {
+ query getActivities($page: Int!, $size: Int!, $name: String, $state: Int) {
+ activities(page: $page, size: $size, name: $name, state: $state) {
content {
id
name
@@ -199,26 +213,26 @@
`, {
page: currentPage,
size: pageSize,
- name: nameFilter
+ name: nameFilter,
+ state: stateFilter
}).then(data => {
if (data.activities) {
let newActivities = data.activities.content
+ // 璋冭瘯锛氳緭鍑烘姤鍚嶆埅姝㈠師濮嬪��
+ try {
+ console.log('娲诲姩鍘熷鎶ュ悕鎴:', newActivities.map(a => ({ id: a.id, name: a.name, signupDeadline: a.signupDeadline })))
+ } catch (e) {}
// 涓烘瘡涓椿鍔ㄦ坊鍔犲悕绉版枃瀛�
- newActivities = newActivities.map(activity => ({
- ...activity,
- nameText: (activity.name || '娲诲姩').substring(0, 2)
- }))
+ // newActivities = newActivities.map(activity => ({
+ // ...activity,
+ // nameText: (activity.name || '娲诲姩').substring(0, 2)
+ // }))
- // 鏍规嵁绛涢�夌姸鎬佽繃婊ゆ椿鍔�
- if (filterStatus !== 'all') {
- newActivities = newActivities.filter(activity => activity.state === filterStatus)
- }
-
- // 鍚堝苟鏁版嵁
- const mergedActivities = currentPage === 1
- ? newActivities
- : [...this.data.activities, ...newActivities]
+ // 鍚堝苟鏁版嵁锛氬彧鏈夊湪鐪熸鐨勫姞杞芥洿澶氭椂鎵嶈拷鍔狅紝鍏朵粬鎯呭喌閮芥槸鍏ㄩ噺鏇挎崲
+ const mergedActivities = isLoadMore && this.data.activities.length > 0
+ ? [...this.data.activities, ...newActivities]
+ : newActivities
this.setData({
activities: mergedActivities,
@@ -238,7 +252,7 @@
this.setData({
currentPage: this.data.currentPage + 1
})
- this.loadActivities()
+ this.loadActivities(true) // 浼犲叆true琛ㄧず杩欐槸鍔犺浇鏇村
},
// 杞挱鍥惧垏鎹�
@@ -323,20 +337,61 @@
utils.navigateTo('/pages/activity/detail', { id: activityId })
},
- // 鐐瑰嚮璧涗簨鍗＄墖
- onActivityTap(e) {
- const index = e.currentTarget.dataset.index
- const activity = this.data.activities[index]
- if (activity) {
- this.goToActivityDetail(activity.id)
- }
- },
// 鏍煎紡鍖栨棩鏈�
formatDate(date) {
return utils.formatDate(date, 'MM-DD HH:mm')
},
+ // 璁捐绋块渶瑕佺殑 YYYY-MM-DD锛堝己鍏煎锛氱洿鎺ユ埅鍙栧墠10浣嶏紝閬垮厤 JSCore 鏃ユ湡瑙ｆ瀽宸紓锛�
+ formatDateYYYYMMDD(date) {
+ if (!date && date !== 0) return '鈥�'
+ // 瀛楃涓诧細浼樺厛鍖归厤 YYYY-MM-DD 鐩存帴杩斿洖锛岄伩鍏嶈В鏋�
+ if (typeof date === 'string') {
+ const m = date.match(/^(\d{4}-\d{2}-\d{2})/)
+ if (m) return m[1]
+ }
+ // 鏁板�硷細鏃堕棿鎴筹紙绉�/姣锛夊厹搴�
+ if (typeof date === 'number') {
+ const ts = date > 1e12 ? date : date * 1000
+ const d = new Date(ts)
+ if (!isNaN(d.getTime())) {
+ const y = d.getFullYear()
+ const m = String(d.getMonth() + 1).padStart(2, '0')
+ const day = String(d.getDate()).padStart(2, '0')
+ return `${y}-${m}-${day}`
+ }
+ }
+ // 鍏朵粬鎯呭喌璧板伐鍏峰嚱鏁板厹搴�
+ const v = utils.formatDate(date, 'YYYY-MM-DD')
+ return v && typeof v === 'string' && v.trim() ? v : '鈥�'
+ },
+ onTest(e){
+ const activityId = e.currentTarget.dataset.id
+ const xid = e.currentTarget.dataset.xid;
+ const idx = e.currentTarget.dataset.idx;
+
+ // 绠�鍖栫殑璋冭瘯淇℃伅
+ console.log('鐐瑰嚮娲诲姩璇︽儏 - ID:', activityId, '鍚嶇О:', xid, '绱㈠紩:', idx)
+
+ if (activityId) {
+ this.goToActivityDetail(activityId)
+ }
+ },
+ // 鐐瑰嚮"璇︽儏"鎸夐挳锛堜笌鍗＄墖鐐瑰嚮涓�鑷达級
+ onActivityDetailTap(e) {
+ const activityId = e.currentTarget.dataset.id
+ const xid = e.currentTarget.dataset.xid;
+ const idx = e.currentTarget.dataset.idx;
+
+ // 绠�鍖栫殑璋冭瘯淇℃伅
+ console.log('鐐瑰嚮娲诲姩璇︽儏 - ID:', activityId, '鍚嶇О:', xid, '绱㈠紩:', idx)
+
+ if (activityId) {
+ this.goToActivityDetail(activityId)
+ }
+ },
+
// 鑾峰彇鐘舵�佹枃鏈�
getStatusText(state) {
const statusMap = {
--
Gitblit v1.8.0