no message

@@ -46,8 +46,8 @@
             <el-form-item :label="language==0?'状态':'Status'" required  v-if="user.utype=='1'">
               <el-input v-model="myform.wdsfStatus" disabled/>
             </el-form-item>
-            <el-form-item :label="language==0?'证件号':'Passport number'"  v-if="user.utype=='1'">
-              <el-input v-model="myform.passportNumber"/>
+            <el-form-item :label="language==0?'证件号':'Passport number'" required   v-if="user.utype=='1'">
+              <el-input v-model="myform.passportNumber" disabled/>
             </el-form-item>
             <el-form-item :label="language==0?'有效证件':'Valid Passport'" required  v-if="user.utype=='1'">
               <image-upload v-model="myform.passportUrl" :limit="1" :is-show-tip="false"

@@ -18,20 +18,25 @@
             报到时间：2024年7月14日13:30 -17:00<br/>
             联系人：蒋璐<br/>
             联系电话：15961580050<br/>
+            报名截止日期:<span style="text-decoration: underline">2024-06-30</span><br/>
           </div>
-          <div v-else style="width: 400px;margin: auto"><br/>
+          <div v-else style="width: 400px;margin: auto;text-transform: capitalize"><br/>
             <!--            The age limit for Youth Session: Born between 1st Jan, 2006 and 31st Dec., 2009.<br/>-->
             <!--            The age limit for Juvenile Session: Born after 1 Jan., 2010.<br/>-->
-            Training Camp venue：Worldhotel Grand Juna Wuxi<br/>
+            Training Camp Venue：Worldhotel Grand Juna Wuxi<br/>
             Address：No.111 Hefeng Road, Binhu District, Wuxi, Jiangsu<br/>
             Check-in：From 13:30 to 17:00 on July 14, 2024.<br/>
             Contact Person：Dean Ding<br/>
-            Tel: +86 19951486130<br/>
+            Tel：+86 19951486130<br/>
+            Registration Deadline：<span style="text-decoration: underline">2024-06-30</span><br/>
           </div>
         </div>
-        <div class="text-center">
+        <div class="text-center" v-loading="loading">
           <el-button type="primary" v-if="courseList.length>0" class="btn-lineG" round @click="setActive(1)">
-            {{ language == 0 ? '下一步' : 'NEXT' }}
+            <span v-if="dayjs().format('YYYY-MM-DD')>'2024-06-30'">
+              {{ language == 0 ? '报名已结束' : 'Registration has ended' }}
+            </span>
+            <span v-else>{{ language == 0 ? '下一步' : 'NEXT' }}</span>
           </el-button>
           <el-button type="primary" class="btn-lineG" round v-else @click="close">
             {{ language == 0 ? '暂无可报课程' : 'No courses available for reporting' }}
@@ -168,6 +173,7 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import {addInvitation, countryList} from "@/apiPc/match";
 import ImageUpload from "@/components/ImageUpload";
 import {masterClassList, getByCard, submitMasterApply, getMasterApply, delByCard} from "@/apiPc/common";
+import dayjs from "dayjs";
 
 const {proxy} = getCurrentInstance()
 const language = useStorage('language', 0)
@@ -179,6 +185,7 @@ const title = ref('')
 const activeStep = ref(0)
 const countrys = ref([])
 const courseList = ref([])
+const loading = ref(false)
 const cptId = ref('')
 const rules = ref(
     {
@@ -215,12 +222,18 @@ watch(show, (value) => {
 
 function getCourse() {
   // '1777256058082189313'
+  loading.value = true
   masterClassList({cptId: cptId.value}).then(res => {
     courseList.value = res.data
+    loading.value = false
   })
 }
 
 function setActive(n) {
+  if(n==1&&dayjs().format('YYYY-MM-DD')>'2024-06-30'){
+    ElMessage.error(language.value == 0 ? '报名已结束' : 'The application has ended')
+    return
+  }
   activeStep.value = n
 }
 

@@ -175,7 +175,7 @@ import {ref, toRefs, reactive} from "vue"
 import {getCurrentInstance, onMounted} from "@vue/runtime-core";
 import Step3 from "./team/step3"
 import Vcode from "vue3-puzzle-vcode"
-import {ElMessage} from 'element-plus'
+import {ElMessage, ElMessageBox} from 'element-plus'
 import CountDown from '@chenfengyuan/vue-countdown'
 import {checkWdsf, getCaptchaSms, loginSingle, registerSingle} from "@/apiPc/match";
 import {setToken} from "@/utils/auth";
@@ -217,6 +217,9 @@ const {
 } = toRefs(data)
 const matchId = ref('0')
 onMounted(() => {
+  if(user.utype=='1'||user.utype=='2'){
+    router.push({name: 'matchList'})
+  }
   if (language.value == 1) {
     failVcode.value = 'Error!'
     successVcode.value = 'Success!'

@@ -25,10 +25,11 @@ import Step2 from "./step2";
 import Step3 from "./step3";
 import {onMounted, toRefs, reactive} from "vue"
 import {useStorage} from "@vueuse/core/index";
-import {useRoute} from "vue-router";
+import {useRoute,useRouter} from "vue-router";
 import useUserStore from "@/store/modules/user";
 
 const language = useStorage('language', 0)
+const router = useRouter()
 const route = useRoute()
 const data = reactive({
   isShow: false,
@@ -48,6 +49,9 @@ onMounted(() => {
   if (user) {
     form.value.userName = user.userName
   }
+  if(user&&(user.utype=='1'||user.utype=='2')){
+    router.push({name: 'matchList'})
+  }
 })
 const toStep1 = () => {
   activeStep.value = 0