no message

@@ -184,11 +184,11 @@ export function getSupplementInfo(id) {
   })
 }
 
-export function getMySignInfo(data) {
+export function getMySignInfo(query) {
   return request({
     url: `/league/sign/getMySignInfo`,
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 

@@ -90,6 +90,13 @@ export function getNewsListById(query) {
     params: query
   })
 }
+export function getnoteListcptid(query) {
+  return request({
+    url: `/ztx/note/noteList`,
+    method: 'get',
+    params: query
+  })
+}
 export function getNewsList(query) {
   return request({
     url: `/ztx-webSite/website/getNoticeTopList`,

@@ -153,6 +153,9 @@ function getData() {
   if (user.utype == '1') {
     match.getMyPersonInfo().then(res => {
       myform.value = res.data
+      if(language.value=='1'){
+        myform.value.type = '1'
+      }
     })
   }
 

@@ -337,7 +337,12 @@ function afterRecover() {
 }
 
 function goPrev() {
-  router.go(-1)
+  router.push({
+    name: `chooseCoach`,
+    query: {
+      matchId: matchId.value
+    }
+  })
 }
 
 function chooseSportman() {

@@ -17,7 +17,7 @@
           <div class="border-info mt20" v-if="language==0">
             审核结果，后续将以邮件形式正式通知您。
             <br/>
-            邮件发送账号：<span class="text-primary">{{ user.email }}</span>
+            邮件发送账号：<span class="text-primary">wdsfwuxicenter@wdsfwuxicenter.com</span>
             ，请关注相关邮件通知。
             <br/>
             如果您的报名信息审核通过，邮件正文会附上相关费用的支付链接，请通过链接完成支付，完成报名。

@@ -177,6 +177,11 @@ function submitForm() {
   if (editgay) {
     // id不是0
     form.value.cptId = cptId.value
+    if(Array.isArray(form.value.passportUrl)){
+      form.value.passportUrl = form.value.passportUrl[0].url
+    } else {
+      form.value.passportUrl = form.value.passportUrl
+    }
     match.editPersonInfo(form.value).then(res => {
       ElMessage.success('保存成功')
       show.value = false
@@ -208,6 +213,11 @@ function submitForm() {
       form.value.wdsfMin = form.value.min
       form.value.idcCode = form.value.passportNumber
       form.value.idcType = '1'
+      if(Array.isArray(form.value.passportUrl)){
+        form.value.passportUrl = form.value.passportUrl[0].url
+      } else {
+        form.value.passportUrl = form.value.passportUrl
+      }
       match.savePersonForMyPerson(form.value).then(res => {
         ElMessage.success('保存成功')
         show.value = false

@@ -170,6 +170,7 @@ function cancel() {
 function editPerson(row) {
   const params = {
     id: row.id,
+    title: language.value == 0 ?'编辑人员':'Edit Person',
     groupId: groupId
   }
   proxy.$refs['dialogAddCoach'].open(params)

@@ -36,12 +36,25 @@ const props = defineProps({
   groupId: {
     type: Object,
     required: false
+  },
+  matchId: {
+    type: String,
+    required: false
   }
 })
 const user = useUserStore().user
 const groupInfo = useUserStore().group
 if(props.groupId){
+  if(props.matchId){
+    getGroupIdByCptId()
+  } else {
     getGroupInfo()
+  }
+}
+function getGroupIdByCptId() {
+  match.getMyGroupForCpt(props.groupId, props.matchId).then(res=>{
+    groupInfo.value = res.data
+  })
 }
 function getGroupInfo() {
   match.getGroupInfo().then(res => {

@@ -39,7 +39,7 @@ import {onMounted, ref} from "vue";
 import cache from '@/plugins/cache'
 import {getMatchNewslistByCode} from "@/apiPc/match";
 import {useRouter} from "vue-router";
-import {getNewsListById} from "@/apiPc/webSite";
+import {getNewsListById, getnoteListcptid} from "@/apiPc/webSite";
 const language = ref(cache.local.get('language') || 0)
 const router = useRouter()
 const props = defineProps({
@@ -72,17 +72,17 @@ onMounted(() => {
   getList3(query3.value)
 })
 const getList = (obj) => {
-  getNewsListById(obj).then(res => {
+  getnoteListcptid(obj).then(res => {
     newsList.value = res.rows
   })
 }
 const getList2 = (obj) => {
-  getNewsListById(obj).then(res => {
+  getnoteListcptid(obj).then(res => {
     newsList2.value = res.rows
   })
 }
 const getList3 = (obj) => {
-  getNewsListById(obj).then(res => {
+  getnoteListcptid(obj).then(res => {
     newsList3.value = res.rows
   })
 }

@@ -77,6 +77,8 @@
   </el-table>
   <div v-if="showSummary" class="rowSummary">
     <div>
+      {{  language==0?'总人数':'Count' }}:  <span class="mr20">{{ list.length }}</span>
+
       {{  language==0?'金额小计':'Amount' }}:  <span>{{ language==0?'¥':'￡' }}{{ total }}</span>
     </div>
   </div>

@@ -31,6 +31,8 @@
   </el-table>
   <div v-if="showSummary" class="rowSummary">
     <div>
+      {{  language==0?'总报项数':'Count' }}:  <span class="mr20">{{ list.length }}</span>
+
       {{ language==0?'金额小计':'Amount' }}:  <span>{{ language==0?'¥':'￡' }}{{ total }}</span>
     </div>
   </div>

@@ -6,7 +6,7 @@
       </el-card>
       <el-card :body-style="{ padding: '0px' }">
         <match-info-row v-if="matchId" :match-id="matchId"/>
-        <group-info-row />
+        <group-info-row v-if="matchId" :match-id="matchId" :group-id="groupId"/>
         <coach-info-row  v-if="matchId" :match-id="matchId" :language="language"/>
         <div style="margin: 20px">
 
@@ -42,10 +42,14 @@
             </div>
           </el-col>
           <el-col :lg="8" :xs="24" class="text-right pd20">
+
             <el-link  type="primary" @click="exportSignList(1)"><el-icon><Upload /></el-icon>
               {{ language==0?'导出参赛人员清单':'Export Participant List' }}</el-link>
             <el-link  type="primary" @click="exportSignList(2)"><el-icon><Upload /></el-icon>
               {{ language==0?'导出设项报名清单':'Registration Fee for Event Entry' }}</el-link>
+
+            <el-link  type="primary" @click="exportPdf"><el-icon><Upload /></el-icon>
+              {{ language==0?'导出pdf':'Export PDF' }}</el-link>
           </el-col>
         </el-row>
         <div class="text-center pd20">
@@ -175,6 +179,25 @@ function exportSignList(n) {
   }
 
 }
+function exportPdf() {
+  var obj = {
+    cptId: matchId.value,
+    groupId: groupId.value
+  }
+  var fileName
+  if(language.value==0){
+    fileName = '设项报名清单'
+    proxy.download('/league/sign/exportCn', {
+      ...obj
+    }, `${fileName}_${new Date().getTime()}.pdf`)
+  } else {
+    fileName = 'Participant List'
+    proxy.download('/league/sign/exportEn', {
+      ...obj
+    }, `${fileName}_${new Date().getTime()}.pdf`)
+  }
+
+}
 </script>
 
 <style scoped lang="scss">

@@ -190,11 +190,11 @@ onMounted(() => {
 })
 
 function sendsmsMsg() {
-  if (!form.value.account) {
+  if (!wdsfData.value.email) {
     if (language.value == 0) {
-      ElMessage.error('请填写手机/邮箱')
+      ElMessage.error('请填写邮箱')
     } else {
-      ElMessage.error('Please fill in your phone/email address')
+      ElMessage.error('Please fill in your email address')
     }
     return
   }
@@ -251,7 +251,7 @@ function codeSuccess(msg) {
   }
   if (isCodeTrue.value == 2) {
     counting.value = true
-    getCaptchaSms({account: form.value.account}).then(res => {
+    getCaptchaSms({account: wdsfData.value.email}).then(res => {
 
     })
   }
@@ -293,9 +293,13 @@ function next() {
       password: form.value.password,
       sex: wdsfData.value.sex,
       birth: wdsfData.value.birthday,
-      passportUrl: wdsfData.value.passportUrl[0].url,
       passportNumber: wdsfData.value.passportNumber,
     }
+    if(Array.isArray(wdsfData.value.passportUrl)){
+      obj.passportUrl = form.value.passportUrl[0].url
+    } else {
+      obj.passportUrl = wdsfData.value.passportUrl || ''
+    }
     registerSingle(obj).then(res => {
       setToken(res.data.token)
       console.log(matchId.value)