Merge branch 'dev' into bug-order

zhangmeng
Showing 9 changed files with 46 additions and 34 deletions
src/viewsPc/center/myMember.vue
src/viewsPc/match/chooseCoach.vue
src/viewsPc/match/chooseProject.vue
src/viewsPc/match/chooseSportsman.vue
src/viewsPc/match/components/matchInfo.vue
src/viewsPc/match/components/teamSignStep.vue
src/viewsPc/match/detail.vue
src/viewsPc/match/detail_en.vue
vite.config.js
--- a/src/viewsPc/center/myMember.vue
View file @8db6cba
+++ b/src/viewsPc/center/myMember.vue
View file @8db6cba
@@ -2,7 +2,7 @@
  <el-card class="mb20">
    <div class="funcBtns">
      <el-button type="primary" @click="addMember">{{ language==0?'添加选手':'Add Player'}}</el-button>
-      <el-button type="primary" v-if="group.type!='4'" plain @click="importSportman">{{  language==0?'导入选手':'Import Player' }}</el-button>
+<!--      <el-button type="primary" v-if="group.type!='4'" plain @click="importSportman">{{  language==0?'导入选手':'Import Player' }}</el-button>-->
    </div>
    <div class="from-Card">
      <el-form :inline="true" :model="query" class="mt20" :label-width="language==0?60:80" size="small">
--- a/src/viewsPc/match/chooseCoach.vue
View file @8db6cba
+++ b/src/viewsPc/match/chooseCoach.vue
View file @8db6cba
@@ -79,7 +79,7 @@
              </div>
              <div class="card-header" v-else>
                <img src="@/assets/sign/gl.png"/>
-                管理
+                {{ language==0?'管理':'Manager' }}
              </div>
            </template>
            <div class="chooseForm">
@@ -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/chooseProject.vue
View file @8db6cba
+++ b/src/viewsPc/match/chooseProject.vue
View file @8db6cba
@@ -133,7 +133,7 @@
                  </div>
                </template>
              </el-table-column>
-              <el-table-column label="Actions">
+              <el-table-column :label="language==0?'操作':'Actions'">
                <template #default="scope">
                  <a class="text-primary pd10" @click="delperson(scope.row)">
                    {{ language == 0 ? '删除' : 'Delete' }}
--- a/src/viewsPc/match/chooseSportsman.vue
View file @8db6cba
+++ b/src/viewsPc/match/chooseSportsman.vue
View file @8db6cba
@@ -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>
--- a/src/viewsPc/match/components/matchInfo.vue
View file @8db6cba
+++ b/src/viewsPc/match/components/matchInfo.vue
View file @8db6cba
@@ -9,13 +9,17 @@
    <div class="indexTitle" v-if="form.languageSource!='100'"><h3 class="leftboderTT">报名须知</h3></div>
    <div class="xzbox" v-if="form.languageSource!='100'">
      <div v-html="form.signKnow"></div>
-      <el-link v-if="form.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(form.signKnowUrl)[0]?.url)" target="_blank">
+      <div v-if="form.signKnowUrl">
+        <el-link v-for="(item,index) in JSON.parse(form.signKnowUrl)" type="primary"
+                 :href="fillImgUrl(item.url)" target="_blank">
          <el-icon :size="20">
            <Download />
          </el-icon>
-        {{ JSON.parse(form.signKnowUrl)[0]?.name }}
+          {{ item.name }}
        </el-link>
      </div>
+    </div>
 <!--    <div class="indexTitle"><h3 class="leftboderTT">免责声明</h3></div>-->
 <!--    <div class="xzbox">-->
 <!--      <el-link v-if="form.disclaimerUrl" type="primary" :href="fillImgUrl(JSON.parse(form.disclaimerUrl)[0]?.url)" target="_blank">-->
--- a/src/viewsPc/match/components/teamSignStep.vue
View file @8db6cba
+++ b/src/viewsPc/match/components/teamSignStep.vue
View file @8db6cba
 <template>
  <el-steps :active="activeStep" align-center>
    <el-step :title="language==0?'团队信息':'Team Information'"  />
-    <el-step :title="language==0?'教练/领队/其他':'Coach/Team Head of team/Other'" />
+    <el-step :title="language==0?'教练/领队/其他':'Coach/Head Of Team/Other'" />
    <el-step :title="language==0?'选手报名':'Participant Registration'" />
-    <el-step :title="language==0?'提交审核':'Submit for review'" />
+    <el-step :title="language==0?'提交审核':'Submit For Review'" />
  </el-steps>
 </template>
--- a/src/viewsPc/match/detail.vue
View file @8db6cba
+++ b/src/viewsPc/match/detail.vue
View file @8db6cba
@@ -140,15 +140,17 @@
            <div v-if="menu[5].active==1" class="pd20">
              <div class="xzbox">
                <div v-html="matchData.signKnow"></div>
-                <el-link v-if="matchData.signKnowUrl" type="primary"
+                <div v-if="matchData.signKnowUrl">{{JSON.parse(matchData.signKnowUrl)}}
-                         :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
+                  <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
+                           :href="fillImgUrl(item.url)" target="_blank">
                    <el-icon :size="20">
-                    <Download/>
+                      <Download />
                    </el-icon>
-                  {{ JSON.parse(matchData.signKnowUrl)[0]?.name }}
+                    {{ item.name }}
                  </el-link>
                </div>
              </div>
+            </div>
          </el-card>
          <div style="height: 20px"></div>
--- a/src/viewsPc/match/detail_en.vue
View file @8db6cba
+++ b/src/viewsPc/match/detail_en.vue
View file @8db6cba
@@ -241,15 +241,17 @@
            <div v-if="menu[5].active==1" class="pd20">
              <div class="xzbox">
                <div v-html="matchData.signKnow"></div>
-                <el-link v-if="matchData.signKnowUrl" type="primary"
+                <div v-if="matchData.signKnowUrl">
-                         :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
+                  <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
+                           :href="fillImgUrl(item.url)" target="_blank">
                    <el-icon :size="20">
-                    <Download/>
+                      <Download />
                    </el-icon>
-                  {{ JSON.parse(matchData.signKnowUrl)[0]?.name }}
+                    {{ item.name }}
                  </el-link>
                </div>
              </div>
+            </div>
          </el-card>
          <div style="height: 20px"></div>
--- a/vite.config.js
View file @8db6cba
+++ b/vite.config.js
View file @8db6cba
@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
        },
        '/dev-api': {
          // target: 'http://192.168.1.118:8081/',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
          target: 'https://jijin.wtwuxicenter.com/stage-api',
-          // target: 'https://wdsfwuxicenter.com/stage-api',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')
        }