Merge branch 'dev' into order

@@ -635,6 +635,13 @@ export function signgetSignInfoConflict(query) {
     params:query
     params:query
   })
   })
 }
 }
+export function checkMate(query) {
+  return request({
+    url: `/systemj/personInfo/checkMate`,
+    method: 'get',
+    params:query
+  })
+}
 export function addInvitation(data) {
 export function addInvitation(data) {
   return request({
   return request({
     url: `/league/person`,
     url: `/league/person`,

@@ -1030,7 +1030,7 @@ img{display: block;}
 	 .cover{position: absolute;width: 100%;z-index: 1;height: 100%;background: red;opacity: 0;top:0;}
 	 .cover{position: absolute;width: 100%;z-index: 1;height: 100%;background: red;opacity: 0;top:0;}
  }
  }
  .fixed_gg_l{
  .fixed_gg_l{
-	 position: fixed;left:5px;
+	 position: fixed;right:5px;
 	 top: 25%;
 	 top: 25%;
 	 z-index: 10;
 	 z-index: 10;
 	 animation: pop 4s ease infinite;
 	 animation: pop 4s ease infinite;

@@ -125,7 +125,8 @@ service.interceptors.response.use(
     // 未设置状态码则默认成功状态
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200
     const code = res.data.code || 200
     // 获取错误信息
     // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    const msg = errorCode[code] || res.data.msg
+    // const msg = errorCode[code] || res.data.msg || errorCode['default']
     // 二进制数据则直接返回
     // 二进制数据则直接返回
     // debugger
     // debugger
 
 
@@ -164,10 +165,12 @@ service.interceptors.response.use(
         //     isRelogin.show = false
         //     isRelogin.show = false
         //   })
         //   })
       }
       }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+      return Promise.reject('会话已过期，请重新登录。')
     } else if (code === 500) {
     } else if (code === 500) {
-      ElMessage({ message: msg, type: 'error' })
-      sendNotification('错误提示', { body: msg })
+        if(msg){
+            ElMessage({ message: msg, type: 'error' })
+            sendNotification('错误提示', { body: msg })
+        }
       return Promise.reject(new Error(msg))
       return Promise.reject(new Error(msg))
     } else if (code === 601) {
     } else if (code === 601) {
       ElMessage({ message: msg, type: 'warning' })
       ElMessage({ message: msg, type: 'warning' })

@@ -103,7 +103,55 @@
 
 
             <div class="infoPart pd20" v-if="activeIndex==2">
             <div class="infoPart pd20" v-if="activeIndex==2">
               <h3 class="leftboderTT">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</h3>
               <h3 class="leftboderTT">{{ language==0?'体育舞蹈项目':'About Sports Dance' }}</h3>
-              <el-empty/>
+              <div class="content" v-if="language==0">
+                &ensp;&ensp;&ensp;&ensp;WDSF亚洲体育舞蹈节，创办于2023年，是世界体育舞蹈联合会（WDSF）、亚洲体育舞蹈联合会（DSA）、中国体育舞蹈联合会（CDSF）和无锡市四方共同打造的世界级体育舞蹈IP。该项盛会采用“多赛合办、赛会一体”的创新模式，于每年7月，在无锡开展为期一周的体育舞蹈顶级赛事、职业培训、博览盛会、主题展览、行业会议等赛事活动，围绕“节日有竞赛、竞赛节日化”的指导原则，让7月的无锡成为体育舞蹈创意的栖息地、体育舞蹈艺术家的乐土和体育舞蹈文化旅游的热土，有效启动并积极推动世界体育舞蹈中心从欧洲向中国的长期转移，在中国无锡打造“东方舞都”和“世界体育舞蹈第三极”。
+                <br/>
+                &ensp;&ensp;&ensp;&ensp;以WDSF亚洲体育舞蹈节为引领，世界体育舞蹈（无锡）中心顺利落户。世界体育舞蹈（无锡）中心是集世界、洲际、中国三位一体的联合总部基地，也是行业首创的、世界体育组织与国内央地共同创建的、面向全球的产业中心。中心链接国际示范区、产业强市、运动友好型城市等无锡市产业发展政策，推动体育舞蹈在无锡快速形成项目产业集群，并吸引一批与之配套的上下游经济主体，为提升无锡全球体育城市竞争力和城市体育产业能级，提供最高集聚力。
+                <br/>
+                &ensp;&ensp;&ensp;&ensp;首届WDSF亚洲体育舞蹈节，设置了2023年WDSF世界标准舞锦标赛、2023年WDSF世界体育舞蹈大奖赛（中国无锡）、2023年全国体育舞蹈公开系列赛（无锡站）三项国际、国内顶级赛事，吸引了来自全球39个国家及地区的1,716名顶级舞者参与。
+                <br/>
+                &ensp;&ensp;&ensp;&ensp;2024年7月17日至21日，无锡将迎来第二届WDSF亚洲体育舞蹈节。本届盛会在赛事组成上重磅加码，将采用“七赛合一”的办赛方式，举办2024年WDSF世界拉丁舞锦标赛、2024年WDSF世界青年标准舞锦标赛、2024年WDSF世界少年Ⅱ拉丁舞锦标赛、2024年WDSF大奖赛（标准舞、拉丁舞）、2024年WDSF职业世界杯（标准舞、拉丁舞）、2024年WDSF公开赛（标准舞、拉丁舞）以及2024年全国青少年体育舞蹈锦标赛等一系列重点赛事。
+              </div>
+              <div class="content" v-else>
+                WDSF Asian DanceSport Festival, founded in 2023, is a world-class sport dance IP
+                jointly created by four parties: the World DanceSport Federation (WDSF), DanceSport
+                Asia (DSA), Chinese DanceSport Federation (CDSF), and Wuxi City. The event adopts
+                the innovative mode of "multiple competitions, competition, and congress as a whole",
+                and carries out a week-long top sport dance events, professional training, expo, theme
+                exhibition, industry conference, and other activities in Wuxi in July every year, and
+                focuses on the guiding principle of "competition gets into the festive spirit", so that Wuxi
+                in July becomes a habitat for sport dance creativity, a wonderland for sport dance
+                artists and a hot spot for sport dance cultural tourism, effectively launching and actively
+                promoting the long-term transfer of the world's sports dance center from Europe to
+                China, and building the "Oriental Dance Capital" and the "Third Pole of World Sports
+                Dance" in Wuxi, China.
+                <br/><br/>
+                &ensp;&ensp;&ensp;&ensp;With the WDSF Asian DanceSport Festival as the lead, the World DanceSport (Wuxi)
+                Center was successfully settled. As a joint headquarters for the world, continental, and
+                China, also the first of its kind in the industry, a globally oriented industrial center jointly
+                created by a world sports organization and the domestic central and local governments.
+                Wuxi Center links a series of industrial development policies as an international
+                demonstration zone, major industrial city, and sports-friendly city, to promote sports
+                dance in Wuxi to quickly form project industry clusters, and attract a number of
+                supporting upstream and downstream economic subjects, to enhance the
+                competitiveness of Wuxi's global sports city and the city's sports industry capacity, to
+                provide the highest agglomeration force.
+                The First WDSF Asian DanceSport Festival·Wuxi 2023 has covered 3 international and
+                domestic top events as the 2023 WDSF World Championship Standard, 2023 WDSF
+                DanceSport Grand Slam (Wuxi), 2023 China DanceSport Open Series (Wuxi), which
+                attracted a total of 1,716 top-level dancers from 39 countries and regions around the
+                globe.<br/><br/>
+                &ensp;&ensp;&ensp;&ensp;Wuxi will celebrate its 2nd WDSF Asian DanceSport Festival (July 17th
+                -21st
+                , 2024),
+                which turns out to be a blockbuster as ”7 in 1” event mode, including a series of key
+                events such as the WDSF World Championship Latin 2024, WDSF World
+                Championship Youth Standard 2024, WDSF World Championship Junior II Latin 2024,
+                WDSF Grand Slam Latin & Standard 2024, WDSF PD World Cup Latin & Standard
+                2024, WDSF Open Latin & Standard 2024 and 2024 National Youth DanceSport
+                Championships etc.<br/>
+              </div>
+
             </div>
             </div>
           </el-col>
           </el-col>
         </el-row>
         </el-row>

@@ -129,7 +129,7 @@
             </template>
             </template>
           </el-input>
           </el-input>
           <!--          <div class="vcodeBox" :style="isShow?'height:240px':'height:0'">-->
           <!--          <div class="vcodeBox" :style="isShow?'height:240px':'height:0'">-->
-          <Vcode :zIndex="9999" :show="isShow" @success="codeSuccess"></Vcode>
+          <Vcode :successText="successVcode" :failText="failVcode" :slider-text="sliderText" :zIndex="9999" :show="isShow" @success="codeSuccess"></Vcode>
           <!--          </div>-->
           <!--          </div>-->
         </el-form-item>
         </el-form-item>
 
 
@@ -241,7 +241,9 @@ const changePasswordForm = ref({
   password: '',
   password: '',
   confirmPassword: ''
   confirmPassword: ''
 })
 })
-
+const failVcode = ref('验证失败，请重试')
+const successVcode = ref('验证通过！')
+const sliderText = ref('拖动滑块完成拼图')
 const open = (params) => {
 const open = (params) => {
   console.log(params)
   console.log(params)
   show.value = true
   show.value = true
@@ -250,7 +252,11 @@ const open = (params) => {
   changePasswordForm.value.username = params?.account || ''
   changePasswordForm.value.username = params?.account || ''
   if (language.value == 0) {
   if (language.value == 0) {
     title.value = '用户登录'
     title.value = '用户登录'
-  } else {
+  }
+  if (language.value == 1) {
+    failVcode.value = 'Error!'
+    successVcode.value = 'Success!'
+    sliderText.value = 'Drag the slider to complete the puzzle'
     title.value = 'LOGIN'
     title.value = 'LOGIN'
   }
   }
   getCode()
   getCode()

@@ -396,7 +396,6 @@ function chooseSportman() {
 }
 }
 
 
 function changechoosed(e) {
 function changechoosed(e) {
-  // console.log(e)
   choosed2List.value = []
   choosed2List.value = []
   for (var c of athletesList.value) {
   for (var c of athletesList.value) {
     if (choosedchoosed.value.indexOf(c.id) > -1) {
     if (choosedchoosed.value.indexOf(c.id) > -1) {
@@ -407,7 +406,6 @@ function changechoosed(e) {
 }
 }
 
 
 function getProjectList() {
 function getProjectList() {
-  console.log(choosedchoosed.value)
   projectIds.value = []
   projectIds.value = []
   if (choosedchoosed.value.length == 0) {
   if (choosedchoosed.value.length == 0) {
     projectList.value = []
     projectList.value = []
@@ -437,7 +435,6 @@ function getChoosed(list) {
     // openTour.value = false
     // openTour.value = false
     tourCurrent.value = 1
     tourCurrent.value = 1
   }
   }
-  // console.log('选好了', choosedchoosed.value)
 }
 }
 
 
 function addCoach() {
 function addCoach() {
@@ -531,8 +528,6 @@ function goMySign() {
 
 
 const goPersonInfo = (row) => {
 const goPersonInfo = (row) => {
   // 完善补充信息
   // 完善补充信息
-  console.log(row)
-  // debugger
   const params = {
   const params = {
     matchId: matchId.value,
     matchId: matchId.value,
     title: language.value == 0 ? '完善补充信息' : 'Complete the supplementary information',
     title: language.value == 0 ? '完善补充信息' : 'Complete the supplementary information',
@@ -568,7 +563,6 @@ function switchTabletype() {
 }
 }
 
 
 watch(projectIds, (newVal, oldVal) => {
 watch(projectIds, (newVal, oldVal) => {
-  console.log(projectIds.value)
   if (newVal.length > oldVal.length) {
   if (newVal.length > oldVal.length) {
     currProjectId.value = _.last(newVal)
     currProjectId.value = _.last(newVal)
   } else {
   } else {
@@ -577,7 +571,6 @@ watch(projectIds, (newVal, oldVal) => {
 })
 })
 
 
 function changeProject(e) {
 function changeProject(e) {
-  console.log(projectIds.value, e)
   var obj = {}
   var obj = {}
   obj = _.find(projectList.value, (c) => {
   obj = _.find(projectList.value, (c) => {
     return e.indexOf(c.id) > -1
     return e.indexOf(c.id) > -1
@@ -605,9 +598,23 @@ function removeCurproject() {
   // projectIds.value
   // projectIds.value
   projectIds.value = _.without(projectIds.value, currProjectId.value)
   projectIds.value = _.without(projectIds.value, currProjectId.value)
 }
 }
-
+function checkTwo(a,b) {
+  match.checkMate({per1Id:a,per2Id:b}).then(res=>{
+    if(!res.data){
+      ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
+    }
+  })
+}
 watch(choosedchoosed, (newVal, oldVal) => {
 watch(choosedchoosed, (newVal, oldVal) => {
   // console.log(choosedchoosed.value)
   // console.log(choosedchoosed.value)
+  if(newVal.length==2){
+    //如果一男一女，判断是否舞伴
+    if(choosed2List.value.length==2){
+      if(choosed2List.value[0].sex!=choosed2List.value[1].sex){
+        checkTwo(newVal[0],newVal[1])
+      }
+    }
+  }
   if (newVal.length > oldVal.length) {
   if (newVal.length > oldVal.length) {
     match.signgetSignInfoConflict({
     match.signgetSignInfoConflict({
       cptId: matchId.value,
       cptId: matchId.value,
@@ -629,7 +636,6 @@ watch(choosedchoosed, (newVal, oldVal) => {
           }
           }
         }
         }
         projectList.value = []
         projectList.value = []
-        console.log(choosedchoosed.value, choosed2List.value, choosed2Listbak.value)
         return
         return
       } else {
       } else {
         getProjectList()
         getProjectList()

@@ -26,7 +26,7 @@
           {{language==0?'去WDSF官网查询我的会员号':'Search my WSDF MIN on the WDSF official website'}}
           {{language==0?'去WDSF官网查询我的会员号':'Search my WSDF MIN on the WDSF official website'}}
         </a>
         </a>
 
 
-        <Vcode :show="showVcode" :z-index="2999" @success="codeSuccess()"></Vcode>
+        <Vcode :successText="successVcode" :failText="failVcode" :slider-text="sliderText" :show="showVcode" :z-index="2999" @success="codeSuccess()"></Vcode>
       </el-form-item>
       </el-form-item>
       <div class="h30"></div>
       <div class="h30"></div>
       <div class="leftboderTT">{{ language == 0 ? '个人信息' : 'Personal information' }}
       <div class="leftboderTT">{{ language == 0 ? '个人信息' : 'Personal information' }}
@@ -150,9 +150,13 @@ const data = reactive({
   title: '添加选手信息',
   title: '添加选手信息',
   isMe: false,
   isMe: false,
   isCodeTrue: false,
   isCodeTrue: false,
-  cptId: ''
+  cptId: '',
+  failVcode: '验证失败，请重试',
+  successVcode: '验证通过！',
+  sliderText: '拖动滑块完成拼图',
 })
 })
-const {form, show, showVcode, title, labels, uType, isMe, isCodeTrue, card, cptId} = toRefs(data)
+const {form, show, showVcode, title, labels, uType, isMe, isCodeTrue, card, cptId,
+  failVcode,successVcode,sliderText} = toRefs(data)
 
 
 let editgay = false
 let editgay = false
 let groupId = '0'
 let groupId = '0'
@@ -167,6 +171,11 @@ const open = (params) => {
   if (language.value == 0) {
   if (language.value == 0) {
     form.value.countryId = 240
     form.value.countryId = 240
   }
   }
+  if (language.value == 1) {
+    failVcode.value = 'Error!'
+    successVcode.value = 'Success!'
+    sliderText.value = 'Drag the slider to complete the puzzle'
+  }
   if (isMe.value) {
   if (isMe.value) {
     //个人
     //个人
     getMyInfo()
     getMyInfo()

@@ -8,8 +8,16 @@
 
 
       <div class="text-center pd20" v-if="showR">
       <div class="text-center pd20" v-if="showR">
         <img class="mauto" src="@/assets/dance/ok.png"/>
         <img class="mauto" src="@/assets/dance/ok.png"/>
-        <h2 class="text-center">{{ language == 0 ? '申请已提交' : 'Submitted successfully' }}</h2>
-
+<!--        <h2 class="text-center">{{ language == 0 ? '申请已提交' : 'Submitted successfully' }}</h2>-->
+        <h4 class="text-center" v-if="language == 0">
+          我们已收到您的邀请函申请，并将尽快处理。请耐心等待。
+        </h4>
+        <h4 v-else>
+          Your invitation letter application has been received,<br/>
+          and we will process it as soon as possible.
+          <br/>
+          Please be patient while waiting.
+        </h4>
         <el-button size="large" type="primary" @click="conti" round class="btn-lineG">
         <el-button size="large" type="primary" @click="conti" round class="btn-lineG">
           {{ language == 0 ? '继续提交' : 'Continue To Submit' }}
           {{ language == 0 ? '继续提交' : 'Continue To Submit' }}
         </el-button>
         </el-button>
@@ -176,4 +184,5 @@ const conti = () => {
   width: 90%;
   width: 90%;
   margin: auto
   margin: auto
 }
 }
+h4{font-size: 15px;line-height: 1.6;}
 </style>
 </style>

@@ -72,7 +72,7 @@ function getGroupInfo() {
 <style scoped lang="scss">
 <style scoped lang="scss">
 .border-info{
 .border-info{
   .item{margin: 5px 0;color: #4C5359;  font-size: 14px;
   .item{margin: 5px 0;color: #4C5359;  font-size: 14px;
-    label{font-size: 14px;margin-right: 14px}
+    label{font-size: 14px;margin-right: 14px;text-transform: uppercase;}
   }
   }
 }
 }
 </style>
 </style>

@@ -637,7 +637,7 @@ function reSign(){
 }
 }
 function applyInvitation() {
 function applyInvitation() {
   var obj = {
   var obj = {
-    title: language.value==0?'邀请函申请':'Invitation letter application',
+    title: language.value==0?'邀请函申请':'Visa Invitation Letter ',
     cptId: matchId.value,
     cptId: matchId.value,
   }
   }
   proxy.$refs['dialogInvitationRef'].open(obj)
   proxy.$refs['dialogInvitationRef'].open(obj)

@@ -373,7 +373,19 @@ const zuQuery = ref({
 const user = useUserStore().user
 const user = useUserStore().user
 console.log(route.query.orderId)
 console.log(route.query.orderId)
 // 1763462073870237698
 // 1763462073870237698
-getData()
+onMounted(() => {
+  if (route.query.orderId) {
+    getData()
+  }
+  if(route.query.lang){
+    if(route.query.lang=='ZH'){
+      language.value = 0
+    }
+    if(route.query.lang=='EN'){
+      language.value = 1
+    }
+  }
+})
 if (useUserStore().user) {
 if (useUserStore().user) {
   isLogin.value = true
   isLogin.value = true
 }
 }

@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         },
         '/dev-api': {
         '/dev-api': {
-          target: 'http://192.168.1.118:8081/',
+          target: 'http://192.168.1.131:8081/',
           // target: 'https://dance.itechtop.cn/stage-api',
           // target: 'https://dance.itechtop.cn/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api',
           changeOrigin: true,
           changeOrigin: true,