no message

杨炀
Showing 2 changed files with 22 additions and 18 deletions
src/viewsPc/match/chooseCoach.vue
src/viewsPc/match/chooseSportsman.vue
--- a/src/viewsPc/match/chooseCoach.vue
View file @a2fb752
+++ b/src/viewsPc/match/chooseCoach.vue
View file @a2fb752
@@ -313,17 +313,16 @@ function geren() {
 }
 function goNext() {
-  console.log(personAllList.value.teamDoctors,form.value)
  // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
  //   ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
  //   return
  // }
-  if((personAllList.value.coaches.length>=0 && form.value.coachs?.toString().length == 0)&&
+  if((personAllList.value.coaches.length>0 && form.value.coachs?.toString().length == 0)&&
-      (personAllList.value.teamDoctors.length>=0 && form.value.doctor?.toString().length == 0)&&
+      (personAllList.value.teamDoctors.length>0 && form.value.doctor?.toString().length == 0)&&
-      (personAllList.value.translators.length>=0 && form.value.translator?.toString().length == 0)&&
+      (personAllList.value.translators.length>0 && form.value.translator?.toString().length == 0)&&
-      (personAllList.value.others.length>=0 && form.value.other?.toString().length == 0)&&
+      (personAllList.value.others.length>0 && form.value.other?.toString().length == 0)&&
-      (personAllList.value.officials.length>=0 && form.value.official?.toString().length == 0)&&
+      (personAllList.value.officials.length>0 && form.value.official?.toString().length == 0)&&
-      (personAllList.value.leaders.length>=0 && form.value.leader?.toString().length == 0)
+      (personAllList.value.leaders.length>0 && form.value.leader?.toString().length == 0)
  ){
    ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', {
      confirmButtonText: language.value==0?'下一步':'Next',
@@ -360,7 +359,8 @@ function next() {
        name: 'chooseProject',
        query: {
          matchId: matchId,
-          isNational:isNational.value
+          isNational:isNational.value,
+          languageSource:languageSource.value
        }
      })
    })
@@ -374,7 +374,8 @@ function next() {
          matchId: matchId,
          groupId: groupId.value,
          signType: signType.value,
-          isNational:isNational.value
+          isNational:isNational.value,
+          languageSource:languageSource.value
        }
      })
    })
@@ -388,6 +389,7 @@ function goPrev() {
      query: {
        matchId: matchId,
        groupId: groupId.value,
+        languageSource:languageSource.value,
        isNational: false
      }
    })
@@ -397,6 +399,7 @@ function goPrev() {
      query: {
        matchId: matchId,
        groupId: groupId.value,
+        languageSource:languageSource.value,
        isNational:isNational.value
      }
    })
--- a/src/viewsPc/match/chooseSportsman.vue
View file @a2fb752
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @a2fb752
@@ -79,9 +79,11 @@
            <div class="panel border">
              <div class="panel-header ">
                <h3 class="panel-title" v-if="language==0">可参与报名的项目
-                  <span>已报项目在下方查看</span>
+                  <span class="text-danger" v-if="signInfoList.length>0">已报项目在下方查看</span>
+                </h3>
+                <h3 class="panel-title" v-else>Search Events
+                  <span class="text-danger" v-if="signInfoList.length>0">Slide down to view reported projects</span>
                </h3>
-                <h3 class="panel-title" v-else>Search Events</h3>
                <div class="fr">
                  <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search"
                            @change="getProjectList"
@@ -239,7 +241,8 @@ const data = reactive({
  projectQuery: {}, tableType: 1,
  currProjectId: '',
  openTour: false,
-  isNational: false
+  isNational: false,
+  languageSource:''
 })
 const {
  activeTeam,
@@ -267,7 +270,7 @@ const {
  tableType,
  zuQuery,
  openTour, currProjectId,
-  tourCurrent, isNational
+  tourCurrent, isNational,languageSource
 } = toRefs(data)
 const nextButtonProps = ref({})
 const matchId = ref(route.query.matchId)
@@ -281,8 +284,6 @@ onMounted(() => {
  // openTour.value = true
 })
-let chargeFlag
 function getAthletesList() {
  // athletesList.value
  match.getGroupPersonList({label: '0'}, groupId.value).then(res => {
@@ -303,7 +304,6 @@ function getMatch(id) {
  match.getMatchById({
    id: id
  }).then(res => {
-    chargeFlag = res.data.chargeFlag
    noPhotoCanSign.value = res.data.noPhotoCanSign
    coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
    extraform.value = JSON.parse(res.data.participantsInfo)
@@ -385,7 +385,8 @@ function goPrev() {
  router.push({
    name: `chooseCoach`,
    query: {
-      matchId: matchId.value
+      matchId: matchId.value,
+      languageSource: route.query.languageSource
    }
  })
 }
@@ -871,6 +872,6 @@ watch(choosedchoosed, (newVal, oldVal) => {
 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
 .po-right{position: absolute;right: 0;}
 .panel h3.panel-title{
-  span{ color: #999;font-size: 13px;}
+  span{font-size: 13px;}
 }
 </style>