报名

@@ -683,9 +683,9 @@ function goTeamSignCn() {
   })
   })
 }
 }
 
 
-function goPersonalSign() {
+async function goPersonalSign() {
   // 选项目
   // 选项目
-  router.push({
+  await router.push({
     name: 'chooseProject',
     name: 'chooseProject',
     query: {
     query: {
       matchId: matchId.value
       matchId: matchId.value
@@ -873,8 +873,14 @@ async function handelGeRenNext() {
   }
   }
   // 正常报名
   // 正常报名
   if (res.data == 1) {
   if (res.data == 1) {
+    if (matchData.value.languageSource != '100') {
+      // 国际赛
       const flag = await getCheckOcr({ type: '1' })
       const flag = await getCheckOcr({ type: '1' })
       if (flag) await goPersonalSign()
       if (flag) await goPersonalSign()
+    } else {
+      // 国内赛
+      await goPersonalSign()
+    }
   }
   }
   // 提示
   // 提示
   if (res.data == 2) {
   if (res.data == 2) {
@@ -883,9 +889,17 @@ async function handelGeRenNext() {
         ? '运动员的WDSF会员号已变更，是否更新？'
         ? '运动员的WDSF会员号已变更，是否更新？'
         : 'The athlete`s WDSF membership number has been changed. Should it be updated?'
         : 'The athlete`s WDSF membership number has been changed. Should it be updated?'
     )
     )
+    // 删除
     await match.preCheckForPerson({ type: '2' })
     await match.preCheckForPerson({ type: '2' })
+    
+    if (matchData.value.languageSource != '100') {
+      // 国际赛
       const flag = await getCheckOcr({ type: '1' })
       const flag = await getCheckOcr({ type: '1' })
       if (flag) await goPersonalSign()
       if (flag) await goPersonalSign()
+    } else {
+      // 国内赛
+      await goPersonalSign()
+    }
   }
   }
 }
 }
 
 
@@ -909,8 +923,9 @@ const openPickup = () => {
 async function handelPreCheckForGroup(fn) {
 async function handelPreCheckForGroup(fn) {
   const res = await match.preCheckForGroup(groupId.value, '1')
   const res = await match.preCheckForGroup(groupId.value, '1')
   if (res.data == 1 || res.data == 0) {
   if (res.data == 1 || res.data == 0) {
-    const flag = await getCheckOcr({ type: '2', groupId: groupId.value })
-    if (flag) await fn()
+    // const flag = await getCheckOcr({ type: '2', groupId: groupId.value })
+    // if (flag) await fn()
+    await fn()
   }
   }
   if (res.data == 2) {
   if (res.data == 2) {
     await proxy.$modal.confirm(
     await proxy.$modal.confirm(
@@ -918,8 +933,9 @@ async function handelPreCheckForGroup(fn) {
         ? '运动员的WDSF会员号已变更，是否更新？'
         ? '运动员的WDSF会员号已变更，是否更新？'
         : 'The athlete`s WDSF membership number has been changed. Should it be updated?')
         : 'The athlete`s WDSF membership number has been changed. Should it be updated?')
     await match.preCheckForGroup(groupId.value, '2')
     await match.preCheckForGroup(groupId.value, '2')
-    const flag = await getCheckOcr({ type: '2', groupId: groupId.value })
-    if (flag) await fn()
+    // const flag = await getCheckOcr({ type: '2', groupId: groupId.value })
+    // if (flag) await fn()
+    await fn()
   }
   }
 }
 }
 
 
@@ -928,6 +944,7 @@ async function getCheckOcr(obj) {
   if (!data) {
   if (!data) {
     // 人员ocr未通过
     // 人员ocr未通过
     await proxy.$modal.confirm(language.value == 0 ? '请完善人员信息' : 'Please complete the personnel information')
     await proxy.$modal.confirm(language.value == 0 ? '请完善人员信息' : 'Please complete the personnel information')
+    // 完善ocr
     await proxy.$refs['checkAllSportsmanRef'].open(obj.type == 1 ? user.userId : groupId.value, obj.type)
     await proxy.$refs['checkAllSportsmanRef'].open(obj.type == 1 ? user.userId : groupId.value, obj.type)
     return false
     return false
   } else {
   } else {