no message

@@ -135,9 +135,7 @@
 
 
               <div class="tip" v-if="remark">
               <div class="tip" v-if="remark">
                 <label>{{ language == 0 ?'开票须知':'Invoice Notice' }}:</label>
                 <label>{{ language == 0 ?'开票须知':'Invoice Notice' }}:</label>
-                <div>
-                 {{remark}}
-                </div>
+                <div v-html="remark"></div>
               </div>
               </div>
             </div>
             </div>
           </el-col>
           </el-col>
@@ -358,7 +356,8 @@ function goEditAddress(id) {
 function getRemark() {
 function getRemark() {
   getBaseInfoByActiveId(cptId).then(res=>{
   getBaseInfoByActiveId(cptId).then(res=>{
      if(res.data){
      if(res.data){
-       remark.value = res.data.remarks
+       // remark.value = res.data.remarks
+       remark.value = res.data.remarks.replace(/\n/g, '<br>')
      }
      }
   })
   })
 }
 }

@@ -76,6 +76,7 @@ import useUserStore from "@/store/modules/user";
 import cache from "@/plugins/cache";
 import cache from "@/plugins/cache";
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 import {refundApply} from "@/apiPc/match";
 import {refundApply} from "@/apiPc/match";
+import dayjs from "dayjs";
 const language= useStorage('language',0)
 const language= useStorage('language',0)
 const router = useRouter()
 const router = useRouter()
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
@@ -146,6 +147,13 @@ function continueSign(n){
     })
     })
     return
     return
   }
   }
+  if(n.signEndTime <= dayjs().format('YYYY-MM-DD HH:mm:ss')){
+    ElMessage({
+      message: language.value==0?'赛事报名已结束无法继续报名':'The event registration has ended.',
+      type: 'warning'
+    })
+    return
+  }
   if (user.utype == '1') {
   if (user.utype == '1') {
     // 个人报名
     // 个人报名
     router.push({
     router.push({

@@ -46,11 +46,12 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :lg="12">
         <el-col :lg="12">
-          <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth" required>
+          <el-form-item :label="language==0?'出生日期1':'Date of Birth'" prop="birth" required>
             <el-date-picker
             <el-date-picker
                 v-model="form.birth" :disabled="editgay&&form.labelArr.indexOf('0')>-1"
                 v-model="form.birth" :disabled="editgay&&form.labelArr.indexOf('0')>-1"
                 style="width: 100%;"
                 style="width: 100%;"
                 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                 type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+                :disabled-date="disabledBirth"
             />
             />
           </el-form-item>
           </el-form-item>
           <el-form-item :label="language==0?'主要会员角色':'roles'" prop="labelArr">
           <el-form-item :label="language==0?'主要会员角色':'roles'" prop="labelArr">
@@ -106,7 +107,7 @@
 import {reactive, ref, toRefs, watch} from 'vue'
 import {reactive, ref, toRefs, watch} from 'vue'
 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
-import {ElMessage} from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import _ from 'lodash'
 import _ from 'lodash'
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 const language= useStorage('language',0)
 const language= useStorage('language',0)
@@ -249,6 +250,10 @@ function reset(){
     })
     })
   }
   }
 }
 }
+function disabledBirth(date) {
+  const today = dayjs().format('YYYY-MM-DD')
+  return (date.getTime() >= dayjs(today).valueOf())
+}
 function getCountryList() {
 function getCountryList() {
   match.countryList().then(res => {
   match.countryList().then(res => {
     countryList.value = res.data
     countryList.value = res.data

@@ -90,8 +90,9 @@
                         :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
                         :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
             <el-input v-model="form.idcCode" :disabled="editgay" @blur="giveBirthDay"/>
             <el-input v-model="form.idcCode" :disabled="editgay" @blur="giveBirthDay"/>
           </el-form-item>
           </el-form-item>
-          <el-form-item :label="language==0?'出生日期':'Date of Birth'" prop="birth"
-                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1">
+          <el-form-item :label="language==0?'2出生日期':'Date of Birth'" prop="birth"
+                        :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1"
+                        :disabled-date="disabledBirth">
             <el-date-picker
             <el-date-picker
                 v-model="form.birth" :disabled="form.idcType=='0'"
                 v-model="form.birth" :disabled="form.idcType=='0'"
                 style="width: 100%;"
                 style="width: 100%;"
@@ -137,7 +138,7 @@
 import {reactive, ref, toRefs, watch} from 'vue'
 import {reactive, ref, toRefs, watch} from 'vue'
 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import {getCurrentInstance, nextTick, onMounted} from '@vue/runtime-core'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
-import {ElMessage} from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import _ from 'lodash'
 import _ from 'lodash'
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 import {checkWdsf, getCaptchaSms} from "@/apiPc/match";
 import {checkWdsf, getCaptchaSms} from "@/apiPc/match";
@@ -284,6 +285,9 @@ watch(show, (value) => {
     // proxy.$refs['dialogRef'].clearValidate()
     // proxy.$refs['dialogRef'].clearValidate()
   })
   })
 })
 })
+function disabledBirth(time) {
+  return time.getTime() > new Date().getTime()
+}
 function resetCode() {
 function resetCode() {
   isCodeTrue.value = false
   isCodeTrue.value = false
 }
 }