no message

杨炀
Showing 8 changed files with 65 additions and 28 deletions
src/layoutPc/components/AppHeader.vue
src/viewsPc/center/index.vue
src/viewsPc/match/chooseProject.vue
src/viewsPc/match/components/singleSignStep.vue
src/viewsPc/match/detail.vue
src/viewsPc/match/pay.vue
src/viewsPc/match/payOk.vue
src/viewsPc/match/signPreview.vue
--- a/src/layoutPc/components/AppHeader.vue
View file @c90e921
+++ b/src/layoutPc/components/AppHeader.vue
View file @c90e921
@@ -154,14 +154,16 @@ onMounted(() => {
    activeIndex.value = '/notice'
  } else if (route.fullPath.indexOf('about') > -1) {
    activeIndex.value = '/about'
-  } else if (route.fullPath.indexOf('mate') > -1) {
+  } else if (route.fullPath.indexOf('meta') > -1) {
-    activeIndex.value = '/mate'
+    activeIndex.value = '/meta'
  } else if (route.fullPath.indexOf('guide') > -1) {
    activeIndex.value = '/guide'
  } else if (route.fullPath.indexOf('saiC') > -1) {
    activeIndex.value = '/saiC'
+  } else if (route.fullPath.indexOf('match') > -1) {
+    activeIndex.value = '/match/list/0'
  }
-  // console.log(activeIndex.value)
+  console.log(activeIndex.value)
 })
 function changeLanguage(n) {
  proxy.$modal.loading()
--- a/src/viewsPc/center/index.vue
View file @c90e921
+++ b/src/viewsPc/center/index.vue
View file @c90e921
@@ -126,7 +126,7 @@ const menusPersonal = ref([
    isActive: false
  },
    {
-      name: language.value==0?'我的报名':'My Eegistration',
+      name: language.value==0?'我的报名':'My Registration',
      routeName: 'myMatch',
      picUrl1: '/img/nav_28.png',
      picUrl2: '/img/nav_28_dwn.png',
--- a/src/viewsPc/match/chooseProject.vue
View file @c90e921
+++ b/src/viewsPc/match/chooseProject.vue
View file @c90e921
@@ -3,7 +3,7 @@
    <!--    个人报名-国外-->
    <div class="box ph-30">
      <el-card class="mb20">
-        <single-sign-step :activeStep="2" :language="language"/>
+        <single-sign-step :activeStep="1" :language="language"/>
      </el-card>
      <el-card :body-style="{'padding': '0'}">
@@ -429,7 +429,7 @@ function submitForm(n) {
  //           Submission must be completed before the registration deadline${signEndTime.value}。
  //           You can also find this registration in the My Registration section of your personal center and click submit for review.`,
  //       language.value == 0 ? '提示' : 'Tip', {
-  //         confirmButtonText: language.value == 0 ? '去个人中心' : 'Go My Eegistration ',
+  //         confirmButtonText: language.value == 0 ? '去个人中心' : 'Go My Registration ',
  //         cancelButtonText: language.value == 0 ? '知道了' : 'OK',
  //         type: 'warning'
  //       }).then((res) => {
--- a/src/viewsPc/match/components/singleSignStep.vue
View file @c90e921
+++ b/src/viewsPc/match/components/singleSignStep.vue
View file @c90e921
 <template>
  <el-steps :active="activeStep" align-center>
-    <el-step :title="language==0?'教练/领队/其他':'Coach/Team Leader/Other'" />
+    <el-step :title="language==0?'校验 WDSF 会员号':'Check WDSF ID'" />
    <el-step :title="language==0?'选手报名':'Participant Registration'" />
    <el-step :title="language==0?'提交审核':'Submit for review'" />
  </el-steps>
--- a/src/viewsPc/match/detail.vue
View file @c90e921
+++ b/src/viewsPc/match/detail.vue
View file @c90e921
@@ -259,30 +259,58 @@ function changeMenu(menu, l) {
    }
  }
 }
+function goLogin() {
+  useUserStore().setReLogin(true)
+}
 function choseSignType() {
  console.log(matchData.value.signType,user)
  if (!user) {
-    useUserStore().setReLogin(true)
+    goLogin()
-    return
+  } else {
-  }
    checkIsSign().then(() => {
-    if (matchData.value.signType == '0' || (matchData.value.signType == '2' && user.utype == '1')) {
+      switch (matchData.value.signType) {
-      // 个人报名
+        case '0':
-      // router.push({
+          if (user.utype == '1') {
-      //   path: `${matchId.value}/singleSign`
+            goPersonalSign()
-      // })
+          } else {
+            ElMessageBox.confirm(
-      const routeData = router.resolve({
+                '当前活动是个人活动，无法报名',
-        name: `chooseCoach`,
+                '提示',
-        query: {
+                {
-          matchId: matchId.value,
+                  confirmButtonText: '好的',
-          signType: matchData.value.signType
+                  cancelButtonText: '取消',
+                  type: 'warning',
+                }
+            )
+          }
+          break
+        case '1':
+          if (user.utype == '1') {
+            ElMessageBox.confirm(
+                '当前活动是团队活动，无法报名',
+                '提示',
+                {
+                  confirmButtonText: '好的',
+                  cancelButtonText: '取消',
+                  type: 'warning',
+                }
+            )
+          } else {
+            goTeamSign()
+          }
+          break
+        case '2':
+          if (user.utype == '1') {
+            goPersonalSign()
+          } else {
+            goTeamSign()
+          }
+          break
      }
    })
-      window.open(routeData.href, '_blank')
  }
-    if (matchData.value.signType == '1' || (matchData.value.signType == '2' && user.utype == '2')) {
+}
+function goTeamSign() {
  const routeData = router.resolve({
    path: `${matchId.value}/teamSign`,
    query: {
@@ -292,10 +320,17 @@ function choseSignType() {
    }
  })
  window.open(routeData.href, '_blank')
+}
+function goPersonalSign() {
+  // 选项目
+  const routeData = router.resolve({
+    name: `chooseProject`,
+    query: {
+      matchId: matchId.value
    }
  })
+  window.open(routeData.href, '_blank')
 }
 // 获取已报信息
 function checkIsSign() {
  var obj = {
--- a/src/viewsPc/match/pay.vue
View file @c90e921
+++ b/src/viewsPc/match/pay.vue
View file @c90e921
@@ -260,7 +260,7 @@
        <!--        线下支付待核销-->
        <div class="text-center">
          <el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon>
-          <p class="text-success">{{ language==0?'支付成功':'successful!' }}</p>
+          <p class="text-success">{{ language==0?'支付成功':'successfully!' }}</p>
          <h3 class="wePrice">{{ language==0?'¥':'€' }}{{form.totalFee}}</h3>
          <span v-if="language==0" class="text-danger size12">*您可以在上传汇款单完成后，与联系人进行电话确认。具体缴费结果，可以在个人中心-我的报名中查看进度</span>
          <span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
--- a/src/viewsPc/match/payOk.vue
View file @c90e921
+++ b/src/viewsPc/match/payOk.vue
View file @c90e921
@@ -4,7 +4,7 @@
    <el-card class="mb60 mt30">
      <div class="text-center mt30">
        <el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon>
-        <p class="text-success mb20">{{ language==0?'支付成功':'successful!' }}</p>
+        <p class="text-success mb20">{{ language==0?'支付成功':'successfully!' }}</p>
        <el-button type="primary" class="btn-lineG mb60" @click="goBillDetail" round>{{ language==0?'返回订单详情':'Return order details' }}</el-button>
      </div>
--- a/src/viewsPc/match/signPreview.vue
View file @c90e921
+++ b/src/viewsPc/match/signPreview.vue
View file @c90e921
@@ -197,7 +197,7 @@ const submitForm = (n) => {
              Submission must be completed before the registration deadline${signEndTime.value}。
              You can also find this registration in the My Registration section of your personal center and click submit for review.`,
          language.value == 0 ? '提示' : 'Tip', {
-            confirmButtonText: language.value == 0 ? '去个人中心' : 'Go My Eegistration ',
+            confirmButtonText: language.value == 0 ? '去个人中心' : 'Go My Registration ',
            cancelButtonText: language.value == 0 ? '知道了' : 'OK',
            type: 'warning'
          }).then((res) => {