fix: 选手列表去重并显示已报名标记

- loadPlayerList 添加按身份证去重逻辑
- 查询已报名选手并标记 hasRegistered
- UI 显示"已报名"标签
- 选择已报名选手时弹出警告

Closes #3, Closes #4

src/api/athlete.js

@@ -81,5 +81,12 @@ export default {
 
   removeContact(id) {
     return request.post('/martial/contact/remove?ids=' + id, {})
+  },
+
+  /**
+   * 获取已报名选手列表（用于检查重复报名）
+   */
+  getRegisteredAthletes(params = {}) {
+    return request.get('/martial/athlete/registered', params)
   }
 }

src/api/schedule.js

@@ -10,7 +10,7 @@ import request from '@/utils/request.js'
  */
 export function getScheduleResult(competitionId) {
   return request.get('/martial/schedule/result', {
-    params: { competitionId }
+    competitionId
   })
 }
 
@@ -97,7 +97,7 @@ export function saveDispatch(data) {
  */
 export function getScheduleStatus(competitionId) {
   return request.get('/mini/schedule/status', {
-    params: { competitionId }
+    competitionId
   })
 }
 
@@ -106,9 +106,9 @@ export function getScheduleStatus(competitionId) {
  * @param {Number} competitionId - 赛事ID
  * @param {Number} projectId - 项目ID (可选)
  */
-export function getLineup(competitionId, projectId) {
+export function getLineup(competitionId, projectId, orderId) {
   return request.get('/mini/schedule/lineup', {
-    params: { competitionId, projectId }
+    competitionId, projectId, orderId
   })
 }
 

src/pages/add-contact/add-contact.vue

@@ -124,6 +124,36 @@ export default {
       try {
         await athleteAPI.saveContact(this.formData);
         uni.showToast({ title: '保存成功', icon: 'success' });
+        
+        // Set flag to notify previous page
+        uni.setStorageSync('contactListNeedRefresh', true);
+        
+        // Notify previous page to refresh contact list
+        try {
+          const pages = getCurrentPages();
+          console.log('页面栈长度:', pages.length);
+          console.log('页面栈:', pages);
+          if (pages.length >= 2) {
+            const prevPage = pages[pages.length - 2];
+            console.log('上一页:', prevPage);
+            // Try different ways to access the component
+            const vm = prevPage.$vm || prevPage;
+            console.log('vm:', vm);
+            if (vm && typeof vm.loadContactList === 'function') {
+              console.log('调用 loadContactList');
+              vm.loadContactList();
+            } else if (vm && vm.$refs && vm.$refs.page && typeof vm.$refs.page.loadContactList === 'function') {
+              console.log('通过 $refs 调用');
+              vm.$refs.page.loadContactList();
+            }
+          }
+        } catch (e) {
+          console.error('通知上一页失败:', e);
+        }
+        
+        // Also emit event as backup
+        uni.$emit('contactAdded');
+        
         setTimeout(() => { uni.navigateBack(); }, 1500);
       } catch (err) {
         console.error('保存联系人失败:', err);

src/pages/common-info/common-info.vue

@@ -168,7 +168,15 @@ export default {
         })
 
         let list = res.records || (Array.isArray(res) ? res : [])
-        this.playerList = list.map(item => ({
+        // Deduplicate by idCard
+        const seen = new Set()
+        const uniqueList = list.filter(item => {
+          const idCard = item.idCard || item.idCardNumber
+          if (idCard && seen.has(idCard)) return false
+          if (idCard) seen.add(idCard)
+          return true
+        })
+        this.playerList = uniqueList.map(item => ({
           id: item.id,
           name: item.name || item.playerName,
           idCard: item.idCard || item.idCardNumber,

src/pages/event-detail/event-detail.vue

@@ -82,6 +82,7 @@ export default {
   data() {
     return {
       eventId: '',
+      orderId: '',
       eventInfo: {
         id: '',
         title: '',
@@ -96,6 +97,7 @@ export default {
   onLoad(options) {
     if (options.id) {
       this.eventId = options.id
+      this.orderId = options.orderId || null
       this.loadEventDetail(options.id)
     }
   },
@@ -192,7 +194,7 @@ export default {
       if (url) {
         // 跳转时传递赛事ID
         uni.navigateTo({
-          url: `${url}?eventId=${this.eventId}`
+          url: `${url}?eventId=${this.eventId}&orderId=${this.orderId || ""}`
         })
       } else {
         uni.showToast({

src/pages/event-lineup/event-lineup.vue

@@ -41,6 +41,8 @@
             <view class="lineup-name">{{ item.playerName }}</view>
             <view class="lineup-detail">
               <text class="detail-item">{{ item.organization }}</text>
+              <text class="detail-divider" v-if="item.estimatedTime"> | </text>
+              <text class="detail-item" v-if="item.estimatedTime">{{ item.estimatedTime }}</text>
             </view>
           </view>
           <view class="lineup-status" :class="item.status">
@@ -63,6 +65,7 @@ export default {
   data() {
     return {
       eventId: '',
+      orderId: '',
       loading: true,
       isScheduleCompleted: false,
       currentGroupIndex: 0,
@@ -79,6 +82,7 @@ export default {
   onLoad(options) {
     if (options.eventId) {
       this.eventId = options.eventId
+      this.orderId = options.orderId || null
       this.checkScheduleStatus()
     }
   },
@@ -87,8 +91,8 @@ export default {
     async checkScheduleStatus() {
       try {
         const res = await getScheduleStatus(this.eventId)
-        if (res.data) {
+        if (res) {
-          this.isScheduleCompleted = res.data.isCompleted
+          this.isScheduleCompleted = res.isCompleted
           if (this.isScheduleCompleted) {
             await this.loadLineup()
           }
@@ -103,9 +107,9 @@ export default {
 
     async loadLineup() {
       try {
-        const res = await getLineup(this.eventId)
+        const res = await getLineup(this.eventId, null, this.orderId)
-        if (res.data && res.data.groups) {
+        if (res && res.groups) {
-          this.groups = res.data.groups
+          this.groups = res.groups
         }
       } catch (error) {
         console.error('加载出场顺序失败:', error)
@@ -115,6 +119,10 @@ export default {
     getStatusText(status) {
       const map = {
         'waiting': '待出场',
+        '未签到': '待出场',
+        '已完成': '已完成',
+        '进行中': '进行中',
+        '异常': '异常',
         'ongoing': '进行中',
         'finished': '已完成'
       }
@@ -262,17 +270,20 @@ export default {
   flex-shrink: 0;
 }
 
-.lineup-status.finished {
+.lineup-status.finished,
+.lineup-status.已完成 {
   background-color: #E8F5E9;
   color: #4CAF50;
 }
 
-.lineup-status.ongoing {
+.lineup-status.ongoing,
+.lineup-status.进行中 {
   background-color: #FFF3E0;
   color: #FF9800;
 }
 
-.lineup-status.waiting {
+.lineup-status.waiting,
+.lineup-status.未签到 {
   background-color: #F5F5F5;
   color: #999999;
 }

src/pages/event-register/event-register.vue

@@ -30,13 +30,16 @@
         </view>
 
         <view class="player-list">
-          <view class="player-item" v-for="(item, index) in playerList" :key="index">
+          <view class="player-item" v-for="(item, index) in playerList" :key="index" :class="{ 'registered': item.hasRegistered }">
             <view class="player-checkbox" @click="togglePlayer(item)">
               <image v-if="item.selected" class="checkbox-img" src="/static/images/选中@3x.png" mode="aspectFit"></image>
               <image v-else class="checkbox-img" src="/static/images/未选中@3x.png" mode="aspectFit"></image>
             </view>
             <view class="player-info">
-              <view class="player-name">{{ item.name }}</view>
+              <view class="player-name">
+                {{ item.name }}
+                <text v-if="item.hasRegistered" class="registered-tag">已报名</text>
+              </view>
               <view class="player-id">身份证：{{ item.idCard }}</view>
             </view>
             <view class="player-actions">
@@ -282,6 +285,11 @@ export default {
     }
   },
   onLoad(options) {
+    // Listen for contact added event
+    uni.$on('contactAdded', () => {
+      console.log('=== 收到 contactAdded 事件 ===')
+      this.loadContactList()
+    })
     if (options.eventId) {
       this.eventId = options.eventId
       this.loadEventDetail(options.eventId)
@@ -309,9 +317,21 @@ export default {
       this.loadPlayerList()
     }
   },
+  onUnload() {
+    uni.$off('contactAdded')
+  },
   onShow() {
-    // Refresh contact list when returning from add-contact page
+    console.log('=== onShow 被触发 ===')
-    this.loadContactList()
+    // Check if contact list needs refresh
+    const needRefresh = uni.getStorageSync('contactListNeedRefresh')
+    if (needRefresh) {
+      console.log('检测到需要刷新联系人列表')
+      uni.removeStorageSync('contactListNeedRefresh')
+      this.loadContactList()
+    } else {
+      // Always refresh contact list when page shows
+      this.loadContactList()
+    }
     if (this.currentStep === 1) {
       if (this.isTeamProject) {
         this.loadTeamList()
@@ -324,13 +344,19 @@ export default {
     // Contact methods
     async loadContactList() {
       try {
+        console.log('=== 开始加载联系人列表 ===')
         const res = await athleteAPI.getContactList({ current: 1, size: 100 })
-        this.contactList = (res.records || []).map(item => ({
+        console.log('联系人API返回:', res)
+        const records = res.records || res.data?.records || []
+        console.log('联系人记录:', records)
+        this.contactList = records.map(item => ({
           id: item.id,
           name: item.name,
           phone: item.phone,
-          idCard: item.idCard
+          idCard: item.idCard,
+          isDefault: item.isDefault
         }))
+        console.log('处理后的联系人列表:', this.contactList)
         // Auto select default contact if exists
         if (!this.selectedContact && this.contactList.length > 0) {
           const defaultContact = this.contactList.find(c => c.isDefault) || this.contactList[0]
@@ -403,12 +429,43 @@ export default {
         })
 
         let list = res.records || (Array.isArray(res) ? res : [])
-        this.playerList = list.map(item => ({
+        
-          id: item.id,
+        // Deduplicate by idCard
-          name: item.name || item.athleteName || item.playerName || '未命名',
+        const seen = new Set()
-          idCard: item.idCard || item.idCardNumber || '',
+        list = list.filter(item => {
-          selected: false
+          const key = item.idCard || item.idCardNumber || item.id
-        }))
+          if (seen.has(key)) return false
+          seen.add(key)
+          return true
+        })
+        
+        // Get current project IDs
+        const projectIds = this.selectedProjects.map(p => p.id)
+        
+        // Check which players have already registered for these projects
+        let registeredIdCards = []
+        if (projectIds.length > 0 && this.eventId) {
+          try {
+            const regRes = await athleteAPI.getRegisteredAthletes({
+              competitionId: this.eventId,
+              projectIds: projectIds.join(',')
+            })
+            registeredIdCards = (regRes || []).map(r => r.idCard)
+          } catch (e) {
+            console.log('查询已报名选手失败:', e)
+          }
+        }
+        
+        this.playerList = list.map(item => {
+          const idCard = item.idCard || item.idCardNumber || ''
+          return {
+            id: item.id,
+            name: item.name || item.athleteName || item.playerName || '未命名',
+            idCard: idCard,
+            selected: false,
+            hasRegistered: registeredIdCards.includes(idCard)
+          }
+        })
       } catch (err) {
         console.error('加载选手列表失败:', err)
       }
@@ -455,6 +512,17 @@ export default {
     },
 
     togglePlayer(item) {
+      // Warn if player has already registered for this project
+      if (item.hasRegistered && !item.selected) {
+        uni.showModal({
+          title: '提示',
+          content: '该选手已报名此项目，重复报名将被系统拒绝',
+          confirmText: '知道了',
+          showCancel: false
+        })
+        return
+      }
+      
       const index = this.playerList.findIndex(p => p.id === item.id)
       if (index !== -1) {
         this.$set(this.playerList[index], 'selected', !this.playerList[index].selected)
@@ -566,6 +634,12 @@ export default {
           return
         }
 
+        // 强制验证联系人是否已选择
+        if (!this.selectedContact) {
+          uni.showToast({ title: '请选择联系人', icon: 'none' })
+          return
+        }
+
         const now = new Date()
         const orderNo = `BM${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, '0')}${String(now.getDate()).padStart(2, '0')}${String(now.getHours()).padStart(2, '0')}${String(now.getMinutes()).padStart(2, '0')}${String(now.getSeconds()).padStart(2, '0')}${String(Math.floor(Math.random() * 10000)).padStart(4, '0')}`
 
@@ -801,6 +875,24 @@ export default {
   font-weight: bold;
   color: #333333;
   margin-bottom: 10rpx;
+  display: flex;
+  align-items: center;
+  gap: 10rpx;
+}
+
+.registered-tag {
+  font-size: 22rpx;
+  font-weight: normal;
+  color: #ff6600;
+  background: #fff3e6;
+  padding: 4rpx 12rpx;
+  border-radius: 6rpx;
+  border: 1px solid #ff6600;
+}
+
+.player-item.registered {
+  opacity: 0.7;
+  background: #f9f9f9;
 }
 
 .player-id {

src/pages/my-registration/my-registration.vue

@@ -341,7 +341,7 @@ export default {
     },
     goToEventDetail(item) {
       uni.navigateTo({
-        url: '/pages/event-detail/event-detail?id=' + item.competitionId
+        url: '/pages/event-detail/event-detail?id=' + item.competitionId + '&orderId=' + item.id
       });
     },
     handleViewCert(item) {