Merge commit '077d6ac3' into dev

杨炀
Showing 2 changed files with 254 additions and 225 deletions
src/viewsPc/match/detail_en.vue
src/viewsPc/match/pay.vue
--- a/src/viewsPc/match/detail_en.vue
View file @7ec4fb2
+++ b/src/viewsPc/match/detail_en.vue
View file @7ec4fb2
 <template>
-  <div class="app-container" v-loading="loading">
+  <div v-loading="loading" class="app-container">
    <div class="mt30"/>
    <div v-if="error">
      <el-result
-          icon="error"
        :title="language==0?'未找到赛事':'No Data'"
+        icon="error"
      >
        <template #extra>
        </template>
      </el-result>
    </div>
-    <div class="box mb20" v-else>
+    <div v-else class="box mb20">
      <el-card class="mb20">
        <el-row :gutter="20" align="middle">
          <el-col :lg="matchData.type=='0'?7:8" :md="12" :xl="6">
            <div class="popo">
-              <el-tag v-if="matchData.signType==0">{{ language==0?'个人':'Individual' }}</el-tag>
+              <el-tag v-if="matchData.signType==0">{{ language == 0 ? '个人' : 'Individual' }}</el-tag>
-              <el-tag v-if="matchData.signType==1">{{ language==0?'团体':'Team' }}</el-tag>
+              <el-tag v-if="matchData.signType==1">{{ language == 0 ? '团体' : 'Team' }}</el-tag>
-              <el-tag v-if="matchData.signType==2">{{ language==0?'个人/团体':'Individual/Team' }}</el-tag>
+              <el-tag v-if="matchData.signType==2">{{ language == 0 ? '个人/团体' : 'Individual/Team' }}</el-tag>
            </div>
-            <img class="mauto w100 as16_9" :src="fillImgUrl(matchData.coverUrl)">
+            <img :src="fillImgUrl(matchData.coverUrl)" class="mauto w100 as16_9">
          </el-col>
          <el-col :lg="matchData.type=='0'?9:16" :md="12" :xl="10" style="position: relative">
            <h3 style="margin: 0 0 10px">{{ matchData.name }}</h3>
@@ -32,7 +32,7 @@
                <label class="bm1">{{ language == 0 ? '赛事时间' : 'COMPETITION DATE' }}：</label>
                {{ matchData.beginTime?.slice(0, 10) }} ~
                {{ matchData.endTime?.slice(0, 10) }}</p>
-              <p class="ppl" v-if="matchData.address">
+              <p v-if="matchData.address" class="ppl">
                <label class="bm3">
                  {{ language == 0 ? '地&ensp;&ensp;&ensp;&ensp;点' : 'LOCATION' }}：
                </label>
@@ -40,39 +40,47 @@
              <!--            <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">Registration Deadline：</label>{{ matchData.signEndTime?.slice(0, 10) }}</p>-->
              <p class="ppl"><label>
-                <svg style="position: relative;top: 3px;" t="1712726889323" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                <svg class="icon" height="18" p-id="37235" style="position: relative;top: 3px;"
-                     xmlns="http://www.w3.org/2000/svg" p-id="37235" width="18" height="18">
+                     t="1712726889323"
-                  <path d="M290.88 128H928V96a64 64 0 0 0-64-64H288a192 192 0 0 0-192 192v576a192 192 0 0 0 192 192h576a64 64 0 0 0 64-64V320a64 64 0 0 0-64-64H290.88A64 64 0 0 1 224 192a64 64 0 0 1 66.88-64z m77.12 608l96-22.72v-29.12a123.2 123.2 0 0 1-58.24-84.48c-29.76-2.24-24.64-41.28-24.64-41.28 0-19.84 10.24-26.24 18.56-27.84v-19.2c0-148.48 128-128 128-128a128 128 0 0 1 55.04 5.12c34.56 11.2 72.32 42.24 72.32 123.2v19.2c8.32 1.92 18.56 8 18.56 28.16 0 0 5.12 39.04-24.64 41.28a123.2 123.2 0 0 1-58.24 84.48v29.12l96 22.72c47.04 16.64 0 96 0 96h-320S320 752 368 736z" fill="#d3d8d9" p-id="37236"></path></svg>
+                     version="1.1" viewBox="0 0 1024 1024" width="18" xmlns="http://www.w3.org/2000/svg">
-                {{ language==0?'联&ensp;系&ensp;人':'CONTACT PERSON' }}：</label>{{ matchData.contactPerson }}</p>
+                  <path
+                    d="M290.88 128H928V96a64 64 0 0 0-64-64H288a192 192 0 0 0-192 192v576a192 192 0 0 0 192 192h576a64 64 0 0 0 64-64V320a64 64 0 0 0-64-64H290.88A64 64 0 0 1 224 192a64 64 0 0 1 66.88-64z m77.12 608l96-22.72v-29.12a123.2 123.2 0 0 1-58.24-84.48c-29.76-2.24-24.64-41.28-24.64-41.28 0-19.84 10.24-26.24 18.56-27.84v-19.2c0-148.48 128-128 128-128a128 128 0 0 1 55.04 5.12c34.56 11.2 72.32 42.24 72.32 123.2v19.2c8.32 1.92 18.56 8 18.56 28.16 0 0 5.12 39.04-24.64 41.28a123.2 123.2 0 0 1-58.24 84.48v29.12l96 22.72c47.04 16.64 0 96 0 96h-320S320 752 368 736z"
+                    fill="#d3d8d9" p-id="37236"></path>
+                </svg>
+                {{ language == 0 ? '联&ensp;系&ensp;人' : 'CONTACT PERSON' }}：</label>{{ matchData.contactPerson }}
+              </p>
              <p class="ppl">
                <label>
-                  <svg style="position: relative;top: 2px;" t="1711708779620" class="icon" viewBox="0 0 1024 1024"
+                  <svg class="icon" height="20" p-id="7920" style="position: relative;top: 2px;"
-                       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7920" width="20" height="20">
+                       t="1711708779620" version="1.1" viewBox="0 0 1024 1024" width="20" xmlns="http://www.w3.org/2000/svg">
                    <path
                      d="M398.652952 165.692952c-32.280381-46.006857-58.172952-61.318095-92.867047-54.808381-14.969905 2.80381-24.210286 7.850667-41.20381 22.528l-12.946285 11.361524-25.185524 20.894476-6.582857 5.753905c-3.705905 3.413333-6.38781 6.217143-9.825524 10.118095-64 72.46019-81.724952 185.782857-44.470857 292.327619 26.794667 76.55619 74.605714 152.624762 142.774857 228.644572 72.289524 80.62781 133.046857 131.364571 202.922666 168.374857 54.857143 29.013333 96.865524 41.74019 145.676191 43.227429 59.001905 1.828571 110.957714-11.50781 153.648762-39.15581a162.133333 162.133333 0 0 0 19.553524-15.189333l8.289523-7.558095 16.335239-15.213715 5.534476-4.924952 10.922666-9.435429c22.040381-19.651048 29.184-31.939048 30.646858-51.370666 2.194286-29.647238-11.215238-52.736-49.737143-85.699048l-26.063238-21.820952-12.117334-10.581334-11.459047-9.825524c-37.229714-30.744381-64.804571-40.69181-100.205715-35.35238-24.283429 3.632762-38.278095 12.141714-63.073523 38.107428l-10.947048 11.654095c-18.041905 19.017143-28.330667 26.258286-43.544381 29.305905-22.25981 4.461714-44.373333-7.046095-80.262095-36.205714-46.250667-37.546667-84.626286-80.676571-117.613715-131.949714-22.869333-35.766857-31.890286-62.902857-24.941714-87.600762 2.82819-9.99619 9.679238-17.042286 24.064-28.184381l14.994286-11.312762 2.413714-1.877334 22.747429-18.553904c20.114286-16.822857 28.281905-28.281905 32.572952-45.836191 8.899048-36.10819 0.487619-66.072381-32.426667-117.638095l-15.62819-24.234667-5.558857-8.533333-6.436572-9.435429z"
-                        p-id="7921" fill="#d3d8d9"></path>
+                      fill="#d3d8d9" p-id="7921"></path>
                  </svg>
                  {{ language == 0 ? '联系电话' : 'TEL' }}：</label>086-{{ matchData.contactTelno }}
              </p>
              <p class="ppl">
                <label>
-                  <svg style="position: relative;top: 4px;" t="1712726978978" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="40177"
+                  <svg class="icon" height="18" p-id="40177" style="position: relative;top: 4px;"
-                       width="18" height="18">
+                       t="1712726978978" version="1.1" viewBox="0 0 1024 1024"
-                    <path d="M853.333333 341.333333l-341.333333 213.333334-341.333333-213.333334V256l341.333333 213.333333 341.333333-213.333333m0-85.333333H170.666667c-47.36 0-85.333333 37.973333-85.333334 85.333333v512a85.333333 85.333333 0 0 0 85.333334 85.333333h682.666666a85.333333 85.333333 0 0 0 85.333334-85.333333V256a85.333333 85.333333 0 0 0-85.333334-85.333333z" fill="#d3d8d9" p-id="40178"></path>
+                       width="18" xmlns="http://www.w3.org/2000/svg">
+                    <path
+                      d="M853.333333 341.333333l-341.333333 213.333334-341.333333-213.333334V256l341.333333 213.333333 341.333333-213.333333m0-85.333333H170.666667c-47.36 0-85.333333 37.973333-85.333334 85.333333v512a85.333333 85.333333 0 0 0 85.333334 85.333333h682.666666a85.333333 85.333333 0 0 0 85.333334-85.333333V256a85.333333 85.333333 0 0 0-85.333334-85.333333z"
+                      fill="#d3d8d9" p-id="40178"></path>
                  </svg>
-                {{ language==0?'邮&ensp;&ensp;&ensp;&ensp;箱':'EMAIL' }}：
+                  {{ language == 0 ? '邮&ensp;&ensp;&ensp;&ensp;箱' : 'EMAIL' }}：
                </label>
                {{ matchData.contactEmail }}
              </p>
              <p class="ppl">
                <label>
-                  <svg style="position: relative;top: 2px;" t="1711707785514" class="icon" viewBox="0 0 1024 1024"
+                  <svg class="icon" height="18" p-id="6578" style="position: relative;top: 2px;"
-                       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6578"
+                       t="1711707785514" version="1.1" viewBox="0 0 1024 1024"
-                       width="18" height="18">
+                       width="18" xmlns="http://www.w3.org/2000/svg">
                    <path
                      d="M780 68H256c-71.6 0-130.2 55.5-130.2 123.2v711.2c1.5 42.8 50 69.3 90.6 50.6l227.2-105c38.5-17.8 83.4-18.5 122.6-1.9l255.4 108.6c34.8 14.8 76.1-2.7 86.3-37.6 1.6-5.4 2.4-11 2.4-16.9v-709C910.2 123.5 851.6 68 780 68zM276.9 231.3h255.9c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41z m386.8 464H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41h386.8c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41z m0-191H276.9c-23.9 0-43.3-18.4-43.3-41s19.4-41 43.3-41h386.8c23.9 0 43.3 18.4 43.3 41s-19.4 41-43.3 41z"
-                        p-id="6579" fill="#d3d8d9"></path>
+                      fill="#d3d8d9" p-id="6579"></path>
                  </svg>
                  {{ language == 0 ? '分&ensp;站&ensp;赛' : 'NO. OF TOURNAMENTS' }}：</label>
                {{ matchData.cpts.length }}
@@ -89,41 +97,43 @@
                {{ matchData.address }}
              </p>
              <p class="ppl"><label>{{ language == 0 ? '赛事级别' : 'EVENT LEVEL' }}：</label>{{ matchData.level }}</p>
-<!--              <p class="ppl">-->
+              <!--              <p class="ppl">-->
-<!--                <label>{{ language == 0 ? '报名截止' : 'Registration Deadline' }}：</label>-->
+              <!--                <label>{{ language == 0 ? '报名截止' : 'Registration Deadline' }}：</label>-->
-<!--                {{ matchData.signEndTime?.slice(0, 10) }}-->
+              <!--                {{ matchData.signEndTime?.slice(0, 10) }}-->
-<!--              </p>-->
+              <!--              </p>-->
-              <p class="ppl" v-if="matchData.contactPerson">
+              <p v-if="matchData.contactPerson" class="ppl">
                <label>{{ language == 0 ? '联&ensp;系&ensp;人' : 'CONTACT PERSON' }}：</label>
                {{ matchData.contactPerson }}
              </p>
              <p class="ppl"><label>{{ language == 0 ? '联系电话' : 'TEL' }}：</label>
                086-{{ matchData.contactTelno }}
              </p>
-              <p class="ppl" v-if="matchData.contactEmail">
+              <p v-if="matchData.contactEmail" class="ppl">
                <label>{{ language == 0 ? '邮&ensp;&ensp;&ensp;&ensp;箱' : 'EMAIL' }}：</label>
                {{ matchData.contactEmail }}</p>
            </div>
            <div style="height: 30px"></div>
            <div class="ppl_pb">
-              <el-link class="mr20" v-if="matchData.signKnowUrl&&JSON.parse(matchData.signKnowUrl)?.length>0" type="primary"
+              <el-link v-if="matchData.signKnowUrl&&JSON.parse(matchData.signKnowUrl)?.length>0" :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)"
-                       :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank">
+                       class="mr20"
+                       target="_blank" type="primary">
                <el-icon :size="20">
                  <Download/>
                </el-icon>
                {{ language == 0 ? '报名须知' : 'Notes' }}
              </el-link>
-              <el-link class="mr20" v-if="matchData.disclaimerUrl&&JSON.parse(matchData.disclaimerUrl)?.length>0" type="primary"
+              <el-link v-if="matchData.disclaimerUrl&&JSON.parse(matchData.disclaimerUrl)?.length>0" :href="fillImgUrl(JSON.parse(matchData.disclaimerUrl)[0]?.url)"
-                       :href="fillImgUrl(JSON.parse(matchData.disclaimerUrl)[0]?.url)" target="_blank">
+                       class="mr20"
+                       target="_blank" type="primary">
                <el-icon :size="20">
                  <Download/>
                </el-icon>
                {{ language == 0 ? '免责声明' : 'Disclaimers' }}
              </el-link>
-              <el-link v-if="matchData.ruleUrl&&JSON.parse(matchData.ruleUrl)?.length>0" type="primary"
+              <el-link v-if="matchData.ruleUrl&&JSON.parse(matchData.ruleUrl)?.length>0" :href="fillImgUrl(JSON.parse(matchData.ruleUrl)[0]?.url)"
-                       :href="fillImgUrl(JSON.parse(matchData.ruleUrl)[0]?.url)"
+                       target="_blank"
-                       target="_blank">
+                       type="primary">
                <el-icon :size="20">
                  <Download/>
                </el-icon>
@@ -132,12 +142,12 @@
            </div>
          </el-col>
-          <el-col :lg="8" :md="12" :xl="8" v-if="matchData.type=='0'">
+          <el-col v-if="matchData.type=='0'" :lg="8" :md="12" :xl="8">
-            <p class="countDownTitle" v-if="language==0">
+            <p v-if="language==0" class="countDownTitle">
              <span v-if="startSign>0">报名开始倒计时</span>
              <span v-else>报名截止倒计时</span>
            </p>
-            <p class="countDownTitle" v-else>
+            <p v-else class="countDownTitle">
              <span>REGISTRATION COUNTDOWN</span>
            </p>
@@ -155,82 +165,90 @@
            </van-count-down>
            <div class="flexCenter">
-              <el-button v-if="matchData.progressStatusCode=='2'" ref="RegisterRef" type="primary" round
+              <el-button v-if="matchData.progressStatusCode=='2'" ref="RegisterRef" class="btn-lineG mt10 w100" round
-                         class="btn-lineG mt10 w100"
+                         style="font-size: 16px"
-                         @click="choseSignType" style="font-size: 16px">
+                         type="primary" @click="choseSignType">
                {{ language == 0 ? '我要报名' : 'REGISTER' }}
              </el-button>
-              <div v-else-if="time<=0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">
+              <div v-else-if="time<=0" class="btn-lineG mb20 mauto text-center" style="opacity: 0.5;">
                {{ language == 0 ? '报名已结束' : 'Registration has ended' }}
              </div>
-              <div v-else-if="startSign>0" style="opacity: 0.5;" class="btn-lineG mb20 mauto text-center">
+              <div v-else-if="startSign>0" class="btn-lineG mb20 mauto text-center" style="opacity: 0.5;">
                {{ language == 0 ? '报名未开始' : 'Not started yet' }}
              </div>
            </div>
-            <p class="text-gray text-center uppercase">{{ language==0?'报名截止':'Registration Deadline' }}：{{ matchData.signEndTime?.slice(0,10) }}</p>
+            <p class="text-gray text-center uppercase">{{
+                language == 0 ? '报名截止' : 'Registration Deadline'
+              }}：{{ matchData.signEndTime?.slice(0, 10) }}</p>
          </el-col>
        </el-row>
      </el-card>
-<!--      只联赛有-->
+      <!--      只联赛有-->
-      <quick-row :match-id="matchId"  v-if="matchData.leagueId==0"/>
+      <quick-row v-if="matchData.leagueId==0" :match-id="matchId"/>
-      <el-row :gutter="20" v-if="matchData.type=='0'">
+      <el-row v-if="matchData.type=='0'" :gutter="20">
        <el-col :lg="18">
          <el-card :body-style="{'padding':'0'}">
            <div class="lineHead">
              <ul>
-                <li v-for="l in menu" :key="l.name" @click="changeMenu(menu,l)" :class="l.active==1?'active':''">
+                <li v-for="l in menu" :key="l.name" :class="l.active==1?'active':''" @click="changeMenu(menu,l)">
                  {{ language == 0 ? l.cn : l.name }}
                </li>
              </ul>
            </div>
-            <matchInfo :form="matchData" v-if="menu[0].active==1"/>
+            <matchInfo v-if="menu[0].active==1" :form="matchData"/>
            <div v-if="menu[1].active==1">
-              <match-info-project-list :match-id="matchData.id" :is-national="isNational"/>
+              <match-info-project-list :is-national="isNational" :match-id="matchData.id"/>
            </div>
-            <match-schedule-list :match-data="matchData" v-if="menu[2].active==1"/>
+            <match-schedule-list v-if="menu[2].active==1" :match-data="matchData"/>
            <div v-if="menu[3].active==1">
              <div v-if="matchData.showPersonFlag=='1'">
-<!--                <el-row :gutter="20" v-if="matchData.signType == '0'">-->
+                <!--                <el-row :gutter="20" v-if="matchData.signType == '0'">-->
-<!--                  <el-col v-for="t in signDoneGroupList" :key="t.id" :span="8">-->
+                <!--                  <el-col v-for="t in signDoneGroupList" :key="t.id" :span="8">-->
-<!--                    <div class="teamItem">-->
+                <!--                    <div class="teamItem">-->
-<!--                      <el-avatar :size="60" :src="fillImgUrl(t.imgUrl||t.avatar)"/>-->
+                <!--                      <el-avatar :size="60" :src="fillImgUrl(t.imgUrl||t.avatar)"/>-->
-<!--                      <span class="name">{{ t.name }}</span>-->
+                <!--                      <span class="name">{{ t.name }}</span>-->
-<!--                    </div>-->
+                <!--                    </div>-->
-<!--                  </el-col>-->
+                <!--                  </el-col>-->
-<!--                </el-row>-->
+                <!--                </el-row>-->
                <el-row :gutter="20" class="pd20">
                  <el-col :span="24">
                    <div class="fr mb20">
                      <div class="flex">
-                      <el-input class="mr10" size="small" v-model="queryGroupList.groupName" :prefix-icon="Search"
+                        <el-input v-model="queryGroupList.groupName" :placeholder="language == 0 ? '请输入参赛队名称' :'Please enter the Team name'" :prefix-icon="Search" class="mr10"
-                                :placeholder="language == 0 ? '请输入参赛队名称' :'Please enter the Team name'"
+                                  clearable
-                                @change="getGroupListByCptId" clearable/>
+                                  size="small" @change="getGroupListByCptId"/>
-                      <el-input size="small" v-model="queryGroupList.athleteName" :prefix-icon="Search"
+                        <el-input v-model="queryGroupList.athleteName" :placeholder=" language == 0 ? '请输入运动员查询' :'Please enter the athlete name'" :prefix-icon="Search"
-                                :placeholder=" language == 0 ? '请输入运动员查询' :'Please enter the athlete name'"
+                                  clearable
-                                @change="getGroupListByCptId" clearable/>
+                                  size="small" @change="getGroupListByCptId"/>
                      </div>
                    </div>
                    <el-table :data="signDoneGroupList">
-                      <el-table-column prop="groupCode" align="center" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
+                      <el-table-column :label="language == 0 ? '组别代码' :'EVENT CODE'" align="center" min-width="120"
-                      <el-table-column prop="group" :label="language == 0 ?'组别':'EVENT'" min-width="200">
+                                       prop="groupCode"/>
+                      <el-table-column :label="language == 0 ?'组别':'EVENT'" min-width="200" prop="group">
                        <template #default="scope">
-                          <div class="esp">{{scope.row.group}}</div>
+                          <div class="esp">{{ scope.row.group }}</div>
                        </template>
                      </el-table-column>
-                      <el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/>
+                      <el-table-column :label="language == 0 ?'男运动员':'man name'" min-width="150"
-                      <el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/>
+                                       prop="maleAthName"/>
-                      <el-table-column prop="danceType" align="center" :label="language == 0 ?'舞种':'Division'" min-width="90"/>
+                      <el-table-column :label="language == 0 ?'女运动员':'woman name'" min-width="150"
-                      <el-table-column prop="countryName" align="center" :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
+                                       prop="femaleAthName"/>
-                      <el-table-column prop="groupName" align="center" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/>
+                      <el-table-column :label="language == 0 ?'舞种':'Division'" align="center" min-width="90"
+                                       prop="danceType"/>
+                      <el-table-column :label="language == 0 ?'国籍':'Representing'" align="center" min-width="130"
+                                       prop="countryName"/>
+                      <el-table-column :label="language == 0 ?'参赛队名称':'Team name'" align="center" min-width="150"
+                                       prop="groupName"/>
                    </el-table>
                    <PaginationPc
                      v-show="signDoneGroupListToTal>0"
-                        :total="signDoneGroupListToTal"
-                        v-model:page="queryGroupList.pageNum"
                      v-model:limit="queryGroupList.pageSize"
+                      v-model:page="queryGroupList.pageNum"
+                      :total="signDoneGroupListToTal"
                      @pagination="getGroupListByCptId"
                    />
                  </el-col>
@@ -249,10 +267,10 @@
              <div class="xzbox">
                <div v-html="matchData.signKnow"></div>
                <div v-if="matchData.signKnowUrl">
-                  <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
+                  <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" :href="fillImgUrl(item.url)"
-                           :href="fillImgUrl(item.url)" target="_blank">
+                           target="_blank" type="primary">
                    <el-icon :size="20">
-                      <Download />
+                      <Download/>
                    </el-icon>
                    {{ item.name }}
                  </el-link>
@@ -273,30 +291,30 @@
          <el-card :body-style="{'padding':'0'}">
            <div class="lineHead">
              <ul>
-                <li v-for="l in menu1" :key="l.name" @click="changeMenu(menu1,l)" :class="l.active==1?'active':''">
+                <li v-for="l in menu1" :key="l.name" :class="l.active==1?'active':''" @click="changeMenu(menu1,l)">
                  {{ language == 0 ? l.cn : l.name }}
                </li>
              </ul>
            </div>
            <!--            分站赛-->
            <substation-list v-if="menu1[0].active==1" :list="matchData.cpts"/>
-            <matchInfo :form="matchData" v-if="menu1[1].active==1"/>
+            <matchInfo v-if="menu1[1].active==1" :form="matchData"/>
-            <match-schedule-list :match-data="matchData" v-if="menu1[2].active==1"/>
+            <match-schedule-list v-if="menu1[2].active==1" :match-data="matchData"/>
          </el-card>
        </el-col>
      </el-row>
    </div>
-    <div class="fixed_gg_l" @click="applyInvitation" v-if="matchData.leagueId==0">
+    <div v-if="matchData.leagueId==0" class="fixed_gg_l" @click="applyInvitation">
-      <img src="@/assets/logo/Invitation_c.png" v-if="language==0"/>
+      <img v-if="language==0" src="@/assets/logo/Invitation_c.png"/>
-      <img src="@/assets/logo/Invitation_e.png" v-else/>
+      <img v-else src="@/assets/logo/Invitation_e.png"/>
    </div>
    <affix-invitation ref="dialogInvitationRef"/>
    <div style="height: 50px"></div>
-    <el-dialog v-model="signTypePop" class="pcloginpop" close-icon="CircleClose"
+    <el-dialog v-model="signTypePop" center class="pcloginpop"
-               center width="450px" title="Choose Type">
+               close-icon="CircleClose" title="Choose Type" width="450px">
      <div>
        <div class="rItem r1" @click="goLogin">
          <h3>{{ language == 0 ? '机构用户' : 'Organization' }}</h3>
@@ -306,8 +324,8 @@
        </div>
      </div>
    </el-dialog>
-    <el-dialog v-model="upgradePop" class="pcloginpop" close-icon="CircleClose"
+    <el-dialog v-model="upgradePop" center class="pcloginpop"
-               center width="450px" title="Upgrade">
+               close-icon="CircleClose" title="Upgrade" width="450px">
      <div>
        <div class="rItem r1" @click="goUpdateTeam">
          <h3>{{ language == 0 ? '升级机构用户' : 'Organization' }}</h3>
@@ -318,7 +336,7 @@
      </div>
    </el-dialog>
-    <a class="ding" @click="openPickup" v-if="matchData.leagueId==0&&matchId=='1802602359043600385'">{{ language==0?'接 / 送机服务':'Pick-up/drop-off service' }}</a>
+    <!--    <a class="ding" @click="openPickup" v-if="matchData.leagueId==0&&matchId=='1802602359043600385'">{{ language==0?'接 / 送机服务':'Pick-up/drop-off service' }}</a>-->
    <pickup ref="pickupRef"></pickup>
  </div>
 </template>
@@ -335,6 +353,7 @@ import {getCurrentInstance, ref} from 'vue'
 import {reactive, onMounted} from '@vue/runtime-core'
 import {useRoute, useRouter} from 'vue-router'
 import AffixInvitation from '@/viewsPc/match/components/affix-invitation'
 const language = useStorage('language', 0)
 const route = useRoute()
 const router = useRouter()
@@ -345,6 +364,7 @@ import {dayjs, ElMessage, ElMessageBox} from 'element-plus'
 import useUserStore from "@/store/modules/user"
 import {useStorage} from "@vueuse/core/index"
 import {Search} from "@element-plus/icons-vue"
 const user = useUserStore().user
 const group = useUserStore().group
 const data = reactive({
@@ -366,15 +386,15 @@ const data = reactive({
    {name: 'Event details', cn: '赛事详情', active: 0},
    {name: 'Schedule', cn: '日程', active: 0}],
  signDoneGroupList: [],
-  signDoneGroupListToTal:0,
+  signDoneGroupListToTal: 0,
-  queryGroupList:{
+  queryGroupList: {
-    name:'',
+    name: '',
-    pageSize:10,
+    pageSize: 10,
-    pageNum:1
+    pageNum: 1
  },
  time: '',
  startSign: '',
-  isNational:false
+  isNational: false
 })
 const {
  error,
@@ -384,8 +404,8 @@ const {
  groupId,
  menu,
  menu1,
-  signDoneGroupList,signDoneGroupListToTal,queryGroupList,
+  signDoneGroupList, signDoneGroupListToTal, queryGroupList,
-  time, startSign,isNational
+  time, startSign, isNational
 } = toRefs(data)
 const signTypePop = ref(false)
 const upgradePop = ref(false)
@@ -420,7 +440,7 @@ function getMatch(id) {
    var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
    time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
    startSign.value = dayjs(res.data.signBeginTime).diff(today, 'millisecond')
-    if(matchData.value.languageSource=='100'){
+    if (matchData.value.languageSource == '100') {
      isNational.value = false
    } else {
      isNational.value = true
@@ -433,15 +453,15 @@ function getMatch(id) {
 }
 function getGroupListByCptId() {
-  match.getGroupListByCptId(matchId.value,queryGroupList.value).then(res => {
+  match.getGroupListByCptId(matchId.value, queryGroupList.value).then(res => {
    signDoneGroupList.value = res.rows
    signDoneGroupListToTal.value = res.total
  })
 }
 function changeMenu(menu, l) {
-  console.log(matchData.value.leagueId,l.name)
+  console.log(matchData.value.leagueId, l.name)
-  if(matchData.value.leagueId=='1778253367748993026' && (l.name=='成绩'||l.name=='Achievement')){
+  if (matchData.value.leagueId == '1778253367748993026' && (l.name == '成绩' || l.name == 'Achievement')) {
    window.open('http://www.cdsf.org.cn/h5/sscj.index?matchID=526')
  }
  for (const n of menu) {
@@ -475,35 +495,38 @@ function choseSignType() {
    })
  }
 }
 function goUpdateTeam() {
  //升级团队
  router.push({
-    name:'teamRegister',
+    name: 'teamRegister',
-    query:{
+    query: {
-      step:'1',
+      step: '1',
-      matchId:matchId.value
+      matchId: matchId.value
    }
  })
 }
 function goUpdatePersonal() {
  //升级团队
  router.push({
-    name:'personalRegister',
+    name: 'personalRegister',
-    query:{
+    query: {
-      matchId:matchId.value
+      matchId: matchId.value
    }
  })
 }
 function goTeamSign() {
  if (matchData.value.languageSource == '100') {
    // 国内
-    if(group.type =='4'){
+    if (group.type == '4') {
      ElMessageBox.confirm(
-          language.value==0?'您的团体类型不符合报名条件':'Your Team type does not meet the registration requirements',
+        language.value == 0 ? '您的团体类型不符合报名条件' : 'Your Team type does not meet the registration requirements',
-          language.value==0?'提示':'Warning',
+        language.value == 0 ? '提示' : 'Warning',
        {
-            confirmButtonText: language.value==1?'OK':'确定',
+          confirmButtonText: language.value == 1 ? 'OK' : '确定',
-            cancelButtonText: language.value==1?'Cancel':'取消',
+          cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
          type: 'warning',
        }
      )
@@ -521,13 +544,13 @@ function goTeamSign() {
    })
  } else {
    // 国际赛
-    if(group?.type!='4'&& matchData.value.countryLimit=='1'){
+    if (group?.type != '4' && matchData.value.countryLimit == '1') {
      ElMessageBox.confirm(
-          language.value==0?'您的团体类型不符合报名条件':'Your Team type does not meet the registration requirements',
+        language.value == 0 ? '您的团体类型不符合报名条件' : 'Your Team type does not meet the registration requirements',
-          language.value==0?'提示':'Warning',
+        language.value == 0 ? '提示' : 'Warning',
        {
-            confirmButtonText: language.value==1?'OK':'确定',
+          confirmButtonText: language.value == 1 ? 'OK' : '确定',
-            cancelButtonText: language.value==1?'Cancel':'取消',
+          cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
          type: 'warning',
        }
      )
@@ -578,18 +601,18 @@ function checkIsSign() {
    groupId: groupId.value || 0
  }
  return match.getMySignInfo(obj).then(res => {
-    switch (res.data.type){
+    switch (res.data.type) {
      case '0':
        // 未报名
        break
      case '1':
        // 提交报名，未审核
        ElMessageBox.confirm(
-            language.value == 0 ?'您的报名信息已提交，是否撤回，重新填写报名信息？':'Your registration information has been submitted. Do you want to withdraw it and fill in the registration information again?',
+          language.value == 0 ? '您的报名信息已提交，是否撤回，重新填写报名信息？' : 'Your registration information has been submitted. Do you want to withdraw it and fill in the registration information again?',
-            language.value==0?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value==1?'Withdraw the registration':'撤回报名信息',
+            confirmButtonText: language.value == 1 ? 'Withdraw the registration' : '撤回报名信息',
-              cancelButtonText: language.value==1?'Cancel':'取消',
+            cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
            type: 'warning',
          }
        ).then(() => {
@@ -599,11 +622,11 @@ function checkIsSign() {
        break
      case '2':
        ElMessageBox.confirm(
-            language.value == 0 ?'报名审批拒绝，是否重新报名':'Registration approval rejected. Do you want to register again',
+          language.value == 0 ? '报名审批拒绝，是否重新报名' : 'Registration approval rejected. Do you want to register again',
-            language.value==0?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value==1?'OK':'确定',
+            confirmButtonText: language.value == 1 ? 'OK' : '确定',
-              cancelButtonText: language.value==1?'Cancel':'取消',
+            cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
            type: 'warning',
          }
        ).then(() => {
@@ -613,11 +636,11 @@ function checkIsSign() {
        break
      case '3':
        ElMessageBox.confirm(
-            language.value == 0 ?'报名已取消，是否重新报名':'Registration cancelled. Do you want to register again',
+          language.value == 0 ? '报名已取消，是否重新报名' : 'Registration cancelled. Do you want to register again',
-            language.value==0?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value==1?'OK':'确定',
+            confirmButtonText: language.value == 1 ? 'OK' : '确定',
-              cancelButtonText: language.value==1?'Cancel':'取消',
+            cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
            type: 'warning',
          }
        ).then(() => {
@@ -628,11 +651,11 @@ function checkIsSign() {
      case '4':
        // 审核通过未缴费
        ElMessageBox.confirm(
-            language.value == 0 ?'您的报名信息已审核通过，如需修改，请联系组委会':'Your registration information has been approved. If you need to make any changes, please contact the organizing committee',
+          language.value == 0 ? '您的报名信息已审核通过，如需修改，请联系组委会' : 'Your registration information has been approved. If you need to make any changes, please contact the organizing committee',
-            language.value==0?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value==1?'OK':'确定',
+            confirmButtonText: language.value == 1 ? 'OK' : '确定',
-              cancelButtonText: language.value==1?'Cancel':'取消',
+            cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
            type: 'warning',
          }
        ).then(() => {
@@ -643,11 +666,11 @@ function checkIsSign() {
      case '5':
        // 审核通过已缴费
        ElMessageBox.confirm(
-            language.value == 0 ?'您的报名信息已完成缴费，如需修改，请联系组委会':'Your registration information has been paid. If you need to make any changes, please contact the organizing committee',
+          language.value == 0 ? '您的报名信息已完成缴费，如需修改，请联系组委会' : 'Your registration information has been paid. If you need to make any changes, please contact the organizing committee',
-            language.value==0?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value==1?'OK':'确定',
+            confirmButtonText: language.value == 1 ? 'OK' : '确定',
-              cancelButtonText: language.value==1?'Cancel':'取消',
+            cancelButtonText: language.value == 1 ? 'Cancel' : '取消',
            type: 'warning',
          }
        )
@@ -656,45 +679,48 @@ function checkIsSign() {
    }
  })
 }
 function withDraw(orderId) {
-  match.withDrawByOrderId(orderId).then(res=>{
+  match.withDrawByOrderId(orderId).then(res => {
    choseSignType()
  })
 }
-function reSign(){
+function reSign() {
  match.recoverMySignFromCancel(matchId.value).then((res) => {
    switchSignType()
  })
 }
 function switchSignType() {
  switch (matchData.value.signType) {
    case '0':
-      if (user.utype == '1' ) {
+      if (user.utype == '1') {
        goPersonalSign()
      }
-      if(user.utype == '2'){
+      if (user.utype == '2') {
        ElMessageBox.confirm(
-            language.value == 0 ?'当前活动是个人活动，无法报名':'The current event is a personal event, cannot register',
+          language.value == 0 ? '当前活动是个人活动，无法报名' : 'The current event is a personal event, cannot register',
-            language.value == 0 ?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value == 0 ?'好的':'OK',
+            confirmButtonText: language.value == 0 ? '好的' : 'OK',
-              cancelButtonText: language.value == 0 ?'取消':'Cancel',
+            cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
            type: 'warning',
          }
        )
      }
-      if(user.utype == '3'){
+      if (user.utype == '3') {
        goGeren()
      }
      break
    case '1':
      if (user.utype == '1') {
        ElMessageBox.confirm(
-            language.value == 0 ?'当前活动是团队活动，无法报名':'The current event is a team event, cannot register',
+          language.value == 0 ? '当前活动是团队活动，无法报名' : 'The current event is a team event, cannot register',
-            language.value == 0 ?'提示':'Warning',
+          language.value == 0 ? '提示' : 'Warning',
          {
-              confirmButtonText: language.value == 0 ?'好的':'OK',
+            confirmButtonText: language.value == 0 ? '好的' : 'OK',
-              cancelButtonText: language.value == 0 ?'取消':'Cancel',
+            cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
            type: 'warning',
          }
        )
@@ -721,29 +747,30 @@ function switchSignType() {
      break
  }
 }
 function applyInvitation() {
  var obj = {
-    title: language.value==0?'邀请函申请':'Visa Invitation Letter ',
+    title: language.value == 0 ? '邀请函申请' : 'Visa Invitation Letter ',
    cptId: matchId.value,
  }
  proxy.$refs['dialogInvitationRef'].open(obj)
 }
-const openPickup= () => {
+const openPickup = () => {
  const obj = {
-    title:language.value==0?'接 / 送机服务':'Pick-up/drop-off service' ,
+    title: language.value == 0 ? '接 / 送机服务' : 'Pick-up/drop-off service',
-    cptId:matchId.value
+    cptId: matchId.value
  }
  proxy.$refs['pickupRef'].open(obj)
 }
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
-.ding{
+.ding {
  position: fixed;
  right: 0;
-  z-index:99;
+  z-index: 99;
-  top:38%;
+  top: 38%;
  background: linear-gradient(-90deg, #8623FC, #453DEA) !important;
  box-shadow: 0 0 10px #666;
  color: #fff;
@@ -751,6 +778,7 @@ const openPickup= () => {
  padding: 10px 20px;
  text-align: center;
 }
 .rItem {
  height: 130px;
  cursor: pointer;
--- a/src/viewsPc/match/pay.vue
View file @7ec4fb2
+++ b/src/viewsPc/match/pay.vue
View file @7ec4fb2
 <template>
  <div style="min-height: 100vh">
-    <div class="box" v-if="!errorBox">
+    <div v-if="!errorBox" class="box">
      <el-card :body-style="{ padding: '0px' }" class="mt20">
        <div slot="header">
          <div class="bg-lineg">{{ language == 0 ? '报名缴费清单' : 'Registration Payment List' }}</div>
@@ -10,15 +10,15 @@
          <group-info-row v-if="groupId" :group-id="groupId" :match-id="matchId"/>
          <coach-info-row v-if="groupId" :group-id="groupId" :match-id="matchId"/>
-          <div class="pd20" v-if="user.utype=='1'&&myMemberTable.length>0">
+          <div v-if="user.utype=='1'&&myMemberTable.length>0" class="pd20">
            <div class="leftboderTT">{{ language == 0 ? '随行人员清单' : 'List of accompanying personnel' }}
            </div>
            <div>
-              <el-table class="mt20" :data="myMemberTable" border>
+              <el-table :data="myMemberTable" border class="mt20">
-                <el-table-column type="index" :label="language=='0'?'序号':'Index'" width="70" align="center"/>
+                <el-table-column :label="language=='0'?'序号':'Index'" align="center" type="index" width="70"/>
-                <el-table-column :label="language=='1'?'Surname':'姓氏'" prop="xing" min-width="100"/>
+                <el-table-column :label="language=='1'?'Surname':'姓氏'" min-width="100" prop="xing"/>
-                <el-table-column :label="language=='0'?'名':'Name'" prop="ming" min-width="100"/>
+                <el-table-column :label="language=='0'?'名':'Name'" min-width="100" prop="ming"/>
-                <el-table-column :label="language==0?'国家/地区':'Nationality'" prop="countryName" min-width="100"/>
+                <el-table-column :label="language==0?'国家/地区':'Nationality'" min-width="100" prop="countryName"/>
                <!--                <el-table-column :label="language=='1'?'Passport number':'护照号'" prop="idcCode" min-width="120"/>-->
                <!--                <el-table-column :label="language=='1'?'Birthday':'生日'" prop="birth"/>-->
                <el-table-column :label="language=='1'?'Gender':'性别'" prop="sexStr"/>
@@ -40,26 +40,26 @@
              </el-table>
            </div>
          </div>
-          <div class="pd20" v-if="signInfoList?.length>0||zuQuery.athName">
+          <div v-if="signInfoList?.length>0||zuQuery.athName" class="pd20">
            <div class="leftboderTT">{{ language == 0 ? '参赛人员保险费' : 'Participant Insurance Fee' }}
              <div class="fr">
-                <el-input size="small" v-model="zuQuery.athName" :prefix-icon="Search"
+                <el-input v-model="zuQuery.athName" :prefix-icon="Search" clearable
-                          @change="getSignList" clearable/>
+                          size="small" @change="getSignList"/>
              </div>
            </div>
            <!--            人员列表-->
-            <sign-info-table class="mt20" v-if="matchId" :show-summary="true" :total="insuranceFeeTotal"
+            <sign-info-table v-if="matchId" :hasAction="false" :list="signInfoList" :match-id="matchId"
-                             :match-id="matchId" :list="signInfoList" :hasAction="false"/>
+                             :show-summary="true" :total="insuranceFeeTotal" class="mt20"/>
          </div>
-          <div class="pd20" v-if="zuTableList?.length>0||zuQuery.groName">
+          <div v-if="zuTableList?.length>0||zuQuery.groName" class="pd20">
            <div class="leftboderTT">{{ language == 0 ? '参赛设项服务费' : 'Registration Fee for Event Entry' }}
              <div class="fr">
-                <el-input size="small" v-model="zuQuery.groName" :prefix-icon="Search"
+                <el-input v-model="zuQuery.groName" :prefix-icon="Search" clearable
-                          @change="getSignList" clearable/>
+                          size="small" @change="getSignList"/>
              </div>
            </div>
-            <zu-table class="mt20" :list="zuTableList" :show-summary="true" :total="serviceFeeTotal"
+            <zu-table :hasAction="false" :list="zuTableList" :show-summary="true" :total="serviceFeeTotal"
-                      :hasAction="false"/>
+                      class="mt20"/>
          </div>
          <el-row class="priceBar">
            <el-col :lg="12" :xs="24" class="pl-15">
@@ -84,11 +84,11 @@
              </el-link>
            </el-col>
            <el-col :lg="12" :xs="24">
-              <div class="flex" v-if="Number(form.totalFee)>0">
+              <div v-if="Number(form.totalFee)>0" class="flex">
-                <div class="item" v-if="signInfoList?.length>0"><label>{{
+                <div v-if="signInfoList?.length>0" class="item"><label>{{
                    language == 0 ? '参赛服务费' : 'REGISTRATION FEE'
                  }}：</label><span>{{ language == 0 ? '¥' : '€' }}{{ serviceFeeTotal }}</span></div>
-                <div class="item" v-if="zuTableList?.length>0"><label>{{
+                <div v-if="zuTableList?.length>0" class="item"><label>{{
                    language == 0 ? '保险费' : 'INSURANCE'
                  }}：</label><span>{{ language == 0 ? '¥' : '€' }}{{ insuranceFeeTotal }}</span></div>
                <div class="item"><label>{{ language == 0 ? '费用总计' : 'Total Cost' }}：</label><span
@@ -99,8 +99,8 @@
        </div>
        <div v-else class="pd20 skeletonBox">
          <el-skeleton :rows="8"/>
-          <el-button type="primary" class="btn-lineG" size="large" :style="language == 0 ?'width:200px':'width:400px'"
+          <el-button :style="language == 0 ?'width:200px':'width:400px'" class="btn-lineG" round size="large"
-                     round @click="showLogin">
+                     type="primary" @click="showLogin">
            {{ language == 0 ? '登录后查看详细报项信息' : 'View detailed report information after logging in' }}
          </el-button>
        </div>
@@ -109,44 +109,44 @@
      <el-card class="mt20 mb20">
        <el-row class="result">
          <el-col :lg="12">
-            <div class="text-warning flex" v-if="form.auditStatus=='1'">
+            <div v-if="form.auditStatus=='1'" class="text-warning flex">
              <img src="@/assets/img/ing.png">
              {{ language == 0 ? '报名信息审核中' : 'Registration Information under review' }}
            </div>
-            <div class="text-success flex" v-if="form.auditStatus=='2'">
+            <div v-if="form.auditStatus=='2'" class="text-success flex">
              <img src="@/assets/img/r.png">
              {{ language == 0 ? '报名信息审核通过' : 'Registration Information Approved' }}
            </div>
-            <div class="text-danger flex" v-if="form.auditStatus=='3'">
+            <div v-if="form.auditStatus=='3'" class="text-danger flex">
              <img src="@/assets/img/w.png">
              <div>
                {{ language == 0 ? '报名信息审核拒绝' : 'Registration Information rejected' }}
                <div v-if="form.reason" class="rre">{{ language == 0 ? '驳回理由' : 'Reason' }}：{{ form.reason }}</div>
              </div>
            </div>
-            <div class="text-danger flex" v-if="form.auditStatus=='4'">
+            <div v-if="form.auditStatus=='4'" class="text-danger flex">
              <img src="@/assets/img/w.png">
              <div>
                {{ language == 0 ? '报名已取消' : 'Registration cancelled' }}
              </div>
            </div>
          </el-col>
-          <el-col :lg="12" v-if="Number(form.totalFee)>0">
+          <el-col v-if="Number(form.totalFee)>0" :lg="12">
-            <div class="priceb" v-if="form.payStatus=='0'">{{ language == 0 ? '待支付金额' : 'Amount Due' }}：<span
+            <div v-if="form.payStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}：<span
              class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
-            <div class="priceb" v-else-if="form.payStatus=='1'">{{
+            <div v-else-if="form.payStatus=='1'" class="priceb">{{
                language == 0 ? '线下支付待核销' : 'Amount Due'
              }}：<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
-            <div class="priceb" v-else-if="form.payStatus=='3'">{{ language == 0 ? '已支付金额' : 'Amount Due' }}：<span
+            <div v-else-if="form.payStatus=='3'" class="priceb">{{ language == 0 ? '已支付金额' : 'Amount Due' }}：<span
              class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
-            <div class="priceb" v-else-if="form.payStatus=='5'">{{ language == 0 ? '已退款' : 'Refunded' }}：<span
+            <div v-else-if="form.payStatus=='5'" class="priceb">{{ language == 0 ? '已退款' : 'Refunded' }}：<span
              class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
-            <div class="priceb" v-else>{{ language == 0 ? '费用总计' : 'Amount Due' }}：<span
+            <div v-else class="priceb">{{ language == 0 ? '费用总计' : 'Amount Due' }}：<span
              class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
          </el-col>
        </el-row>
      </el-card>
-      <el-card class="mb60" v-if="form.auditStatus=='2'&&form.payStatus=='0'&&Number(form.totalFee)>0">
+      <el-card v-if="form.auditStatus=='2'&&form.payStatus=='0'&&Number(form.totalFee)>0" class="mb60">
        <div class="leftboderTT">{{ language == 0 ? '选择支付方式' : 'Choose payment method' }}</div>
        <div class="mt20">
          <el-radio-group v-model="payType" @change="changePaytype">
@@ -154,10 +154,10 @@
            <!--            <el-radio label="1" border>-->
            <!--              <svg t="1709003181386" class="icon" viewBox="0 0 3283 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31015" width="100" height="40"><path d="M1163.122759 94.631724H593.92A133.826207 133.826207 0 0 0 459.034483 228.457931v567.084138a133.473103 133.473103 0 0 0 133.826207 133.826207h570.262069a133.826207 133.826207 0 0 0 134.17931-133.826207v-5.296552s-217.864828-90.394483-328.033103-143.36c-73.445517 90.747586-168.783448 145.478621-267.652414 145.478621-167.017931 0-223.514483-145.831724-144.419311-241.875862a169.136552 169.136552 0 0 1 92.16-51.906207c70.62069-17.302069 184.32 10.946207 290.604138 45.903448A587.211034 587.211034 0 0 0 988.689655 429.373793h-328.73931v-32.838621h168.783448V337.213793h-204.446896v-33.191724h204.446896V219.630345a14.124138 14.124138 0 0 1 14.477241-14.477242h82.273104v98.868966h202.328276v33.191724h-202.328276v59.321379h165.252414a677.605517 677.605517 0 0 1-70.62069 176.551725c50.14069 18.008276 94.984828 35.310345 128.529655 46.256551a930.427586 930.427586 0 0 0 147.950345 42.725518V228.457931a133.826207 133.826207 0 0 0-133.473103-133.826207z" fill="#089fe8" p-id="31016"></path><path d="M663.481379 548.016552a162.78069 162.78069 0 0 0-81.566896 30.366896c-64.617931 55.790345-26.129655 158.190345 104.165517 158.190345 75.917241 0 151.481379-48.375172 211.862069-125.704827-85.804138-40.96-156.424828-70.267586-234.46069-62.852414zM2488.673103 225.28h239.757242v47.668966h85.804138V216.805517a22.951724 22.951724 0 0 0-21.892414-23.304827h-139.122759V149.009655h-89.335172v44.137931h-160.662069v79.80138h85.451034zM1882.394483 360.518621h67.442758v247.172413h73.798621V280.011034h-26.835862l55.437241-126.764137H1970.317241l-87.922758 207.271724zM2824.827586 596.391724l-26.835862-90.747586a13.771034 13.771034 0 0 0-13.064827-10.24h-70.62069l20.48 70.62069H2648.275862v-135.944828h164.546207v-32.132414H2648.275862v-63.55862h164.546207v-32.132414h-409.6v32.132414h164.546207v63.55862h-164.546207v32.132414h164.546207V564.965517h-164.546207v32.132414H2824.827586zM2158.521379 323.442759a16.595862 16.595862 0 0 0-15.183448-9.886897h-63.558621l49.434483 156.424828h75.564138z" fill="#089fe8" p-id="31017"></path><path d="M2319.889655 156.777931h-76.623448v80.154483h-188.557241v32.132414h188.557241v287.426206a13.064828 13.064828 0 0 1-12.358621 12.005518h-38.841379v31.77931h99.222069a30.013793 30.013793 0 0 0 28.601379-29.66069V269.064828h31.073104v-32.132414h-31.073104zM1871.448276 577.677241a913.831724 913.831724 0 0 1-168.783448-80.507586 357.34069 357.34069 0 0 0 141.241379-194.56H1694.896552V249.997241h170.195862v-32.83862H1694.896552V150.422069h-75.211035a15.536552 15.536552 0 0 0-15.183448 15.536552v51.2h-169.136552v32.83862h169.136552v52.612414h-141.241379v32.838621h284.248276a278.951724 278.951724 0 0 1-93.572414 127.470345 360.871724 360.871724 0 0 1-93.572414-94.984828H1483.034483a423.724138 423.724138 0 0 0 122.173793 130.295173 662.775172 662.775172 0 0 1-172.667586 77.329655v39.194482A773.296552 773.296552 0 0 0 1653.230345 529.655172 781.771034 781.771034 0 0 0 1871.448276 614.753103zM1553.655172 674.78069l-70.620689 190.675862h35.310345l13.417931-38.488276h70.620689l12.711724 38.488276h35.310345l-70.620689-190.675862z m-12.711724 128.176551l27.188966-79.095172 26.482758 79.095172zM1796.237241 674.78069h-34.251034v190.675862h115.464827v-26.129655h-81.213793v-164.546207zM2003.155862 674.78069h34.251035v190.322758h-34.251035zM2250.328276 674.78069h-74.151724v190.675862h35.310345v-73.445518h39.900689a58.615172 58.615172 0 1 0 0-117.230344z m-2.118621 91.100689H2210.427586v-64.971034h37.782069a31.073103 31.073103 0 0 1 30.366897 32.485517 30.72 30.72 0 0 1-30.366897 32.485517zM2465.015172 674.78069l-70.620689 190.675862h35.310345l13.417931-38.488276h70.620689l12.711724 38.488276h35.310345l-70.620689-190.675862z m-12.711724 128.176551l27.542069-79.095172 27.188966 79.095172zM2716.071724 755.994483l-38.135172-81.213793H2641.213793l57.555862 112.286896v78.388966h33.897931v-78.388966l0.353104-0.353103 57.555862-111.933793h-37.075862l-37.428966 81.213793z" fill="#089fe8" p-id="31018"></path></svg>-->
            <!--            </el-radio>-->
-            <el-radio label="2" v-if="form.payTypeArr.indexOf('2')>-1" border>
+            <el-radio v-if="form.payTypeArr.indexOf('2')>-1" border label="2">
              <!--              微信-->
-              <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1"
+              <svg class="icon" height="40" p-id="24747" t="1709002960407"
-                   xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40">
+                   version="1.1" viewBox="0 0 3152 1024" width="94" xmlns="http://www.w3.org/2000/svg">
                <path
                  d="M381.998922 630.960647c-4.416173 2.208086-8.832345 3.312129-14.352561 3.312129-12.144474 0-22.080863-7.17628-28.1531-17.66469l-2.208086-4.968194-87.771428-204.247978c-1.104043-2.208086-1.104043-4.416173-1.104043-6.624259 0-9.384367 6.624259-16.560647 15.456603-16.560647 3.312129 0 6.624259 1.104043 9.936388 3.312129l103.780054 78.387062c7.728302 4.968194 16.560647 8.280323 26.497035 8.280324 5.520216 0 11.040431-1.104043 16.560647-3.312129l486.330998-230.192992C819.752022 131.381132 676.226415 60.17035 513.380054 60.17035 248.409704 59.618329 32.017251 250.61779 32.017251 486.883019c0 128.069003 64.586523 244.545553 166.15849 322.932614 7.728302 6.072237 13.248518 16.560647 13.248518 27.601079 0 3.312129-1.104043 7.17628-2.208086 10.488409-7.728302 32.017251-20.976819 84.459299-20.97682 86.667386-1.104043 3.312129-2.208086 8.280323-2.208086 13.248517 0 9.384367 6.624259 16.560647 15.456604 16.560647 3.312129 0 6.624259-1.104043 8.832345-3.312129l104.884097-65.138545c7.728302-4.968194 16.560647-8.280323 25.392992-8.280323 4.416173 0 9.936388 1.104043 14.35256 2.208086 49.129919 15.456604 102.676011 23.736927 157.326146 23.736927 265.522372 0 481.362803-191.551482 481.362803-427.816711 0-71.210782-19.872776-139.109434-54.650135-198.175741L385.863073 628.752561l-3.864151 2.208086z"
                  fill="#09BB07" p-id="24748"></path>
@@ -166,10 +166,10 @@
                  fill="#595757" p-id="24749"></path>
              </svg>
            </el-radio>
-            <el-radio label="3" v-if="form.payTypeArr.indexOf('0')>-1" border>
+            <el-radio v-if="form.payTypeArr.indexOf('0')>-1" border label="3">
              <!--              线下-->
-              <svg t="1709003441012" class="icon" viewBox="0 0 3527 1024" version="1.1"
+              <svg class="icon" height="40" p-id="32905" t="1709003441012"
-                   xmlns="http://www.w3.org/2000/svg" p-id="32905" width="90" height="40">
+                   version="1.1" viewBox="0 0 3527 1024" width="90" xmlns="http://www.w3.org/2000/svg">
                <path
                  d="M316.703858 1.763556h392.789333c54.840889 0 88.917333 45.966222 76.145778 102.542222l-182.897778 807.452444c-12.885333 56.405333-67.783111 102.4-122.652444 102.4H87.327858c-54.755556 0-88.917333-45.994667-76.145778-102.4L194.136747 104.305778C206.936747 47.729778 261.80608 1.763556 316.703858 1.763556"
                  fill="#E0002B" p-id="32906"></path>
@@ -196,10 +196,10 @@
                  fill="#4D4D4D" p-id="32913"></path>
              </svg>
            </el-radio>
-            <el-radio label="4" v-if="form.payTypeArr.indexOf('3')>-1" border>
+            <el-radio v-if="form.payTypeArr.indexOf('3')>-1" border label="4">
              <!--              paypal-->
-              <svg t="1709002828937" class="icon" viewBox="0 0 4220 1024" version="1.1"
+              <svg class="icon" height="40" p-id="22654" t="1709002828937"
-                   xmlns="http://www.w3.org/2000/svg" p-id="22654" width="94" height="40">
+                   version="1.1" viewBox="0 0 4220 1024" width="94" xmlns="http://www.w3.org/2000/svg">
                <path
                  d="M3249.722604 229.409369h-232.537679c-15.641548 0-29.197556 11.470468-32.325865 27.112016l-93.849287 595.421589c-2.08554 11.470468 7.299389 21.898167 18.769857 21.898167h118.875764c11.470468 0 20.855397-8.342159 21.898167-18.769858l27.112016-168.928717c2.08554-15.641548 15.641548-27.112016 32.325866-27.112016h72.99389c153.287169 0 240.879837-74.03666 263.820774-221.06721 10.427699-63.608961 0-114.704684-29.197556-150.158859-31.283096-38.582485-89.678208-58.395112-167.885947-58.395112z m27.112016 216.89613c-12.513238 83.421589-76.1222 83.421589-137.645621 83.421589h-35.454175l25.026476-155.372709c1.04277-9.384929 9.384929-16.684318 18.769858-16.684318h15.641547c41.710794 0 81.336049 0 102.191447 23.983707 12.513238 14.598778 15.641548 35.454175 11.470468 64.651731z"
                  fill="#009CDE" p-id="22655"></path>
@@ -231,18 +231,18 @@
          <div v-if="payType == '2'&&wePayCodeUrl">
            <div class="payImgbox flexCenter">
              <div>
-                <img width="260" class="border" :src="wePayCodeUrl"/>
+                <img :src="wePayCodeUrl" class="border" width="260"/>
                <img class="mt20" src="@/assets/img/sm.png"/>
              </div>
              <div class="ml20">
                <img height="360" src="@/assets/img/rr.jpg"/>
              </div>
            </div>
-            <div class="tip text-center text-danger" v-if="language==0">
+            <div v-if="language==0" class="tip text-center text-danger">
              支付后不要关闭此窗口，等待确认支付成功.
              若长时间未收到支付成功提醒，请刷新页面
            </div>
-            <div class="tip text-center text-danger" v-else>
+            <div v-else class="tip text-center text-danger">
              After payment, do not close this window and wait for confirmation of successful payment.
              <br/>
              If you have not received a notification of successful payment for a long time,
@@ -251,9 +251,9 @@
          </div>
          <div v-if="payType == '3'">
-            <table class="table-border table" cellpadding="0" cellspacing="0">
+            <table cellpadding="0" cellspacing="0" class="table-border table">
              <tr>
-                <th colspan="2" class="head">
+                <th class="head" colspan="2">
                  {{ language == 0 ? '线下缴费的收款信息' : 'Offline Payment Collection Information' }}
                </th>
              </tr>
@@ -305,8 +305,9 @@
              <tr>
                <th>{{ language == 0 ? '操作' : 'Actions' }}</th>
                <td>
-                  <file-upload :limit="1" v-model="voucherObj" :button-type="1" :is-show-tip="false"
+                  <file-upload v-model="voucherObj" :button-text="language==0?'上传汇款单':'Upload Remittance Receipt'"
-                               :button-text="language==0?'上传汇款单':'Upload Remittance Receipt'"/>
+                               :button-type="1" :is-show-tip="false"
+                               :limit="1"/>
                  <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>
@@ -315,33 +316,33 @@
            </table>
            <div class="text-center">
-              <el-button type="primary" @click="upRR" round class="btn-lineG w200px">{{
+              <el-button class="btn-lineG w200px" round type="primary" @click="upRR">{{
                  language == 0 ? '保存' : 'Save'
                }}
              </el-button>
            </div>
          </div>
-          <div class="text-center mt20" v-else>
+          <div v-else class="text-center mt20">
-            <el-button v-if="!hideconfirmbtn" type="primary" @click="goPay" round class="btn-lineG w200px">
+            <el-button v-if="!hideconfirmbtn" class="btn-lineG w200px" round type="primary" @click="goPay">
              {{ language == 0 ? '确定' : 'Submit' }}
            </el-button>
          </div>
        </div>
      </el-card>
      <el-card class="mb60">
-        <div class="text-center" v-if="form.payStatus == '3'">
+        <div v-if="form.payStatus == '3'" class="text-center">
          <el-icon color="#32B16C" size="80">
            <SuccessFilled/>
          </el-icon>
          <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
          <h3 class="wePrice">{{ language == 0 ? '¥' : '€' }}{{ form.totalFee || 0 }}</h3>
-          <el-button type="primary" round class="btn-lineG w200px" @click="downInvoice">
+          <el-button v-if="language != 0" class="btn-lineG w200px" round type="primary" @click="downInvoice">
            {{ language == 0 ? '下载收据' : 'DownLoad Invoice' }}
          </el-button>
        </div>
      </el-card>
-      <el-card class="mb60" v-if="form.payStatus == '1' && form.curPayType=='2'">
+      <el-card v-if="form.payStatus == '1' && form.curPayType=='2'" class="mb60">
        <!--        线下支付待核销-->
        <label>{{ language == 0 ? '线下支付' : 'Offline Payment' }}</label>
        <div class="text-center">
@@ -357,22 +358,22 @@
      </el-card>
    </div>
-    <div class="box" v-if="errorBox">
+    <div v-if="errorBox" class="box">
      <el-result
-          icon="error"
-          :title="language==0?'未找到对应订单':'No corresponding order found'"
        :sub-title="language==0?'请确认订单号是否正确':'Please confirm if the order number is correct'"
+        :title="language==0?'未找到对应订单':'No corresponding order found'"
+        icon="error"
      >
        <template #extra>
-          <el-button type="primary" @click="goHome" class="btn-lineG w200px" round>
+          <el-button class="btn-lineG w200px" round type="primary" @click="goHome">
            {{ language == 0 ? '返回首页' : 'Home' }}
          </el-button>
        </template>
      </el-result>
    </div>
-    <el-dialog :title="language==0?'开收据':'Issue a receipt'" v-model="showSJDialog" width="460px"
+    <el-dialog v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false"
-               :close-on-click-modal="false" :close-on-press-escape="false">
+               :title="language==0?'开收据':'Issue a receipt'" width="460px">
      <div class="flex">
        <el-form-item :label="language==0?'开票人':'Name'">
          <div class="flex">
@@ -523,7 +524,7 @@ function getSignList() {
  }).catch(err => {
    if (isLogin.value) {
      router.push({name: 'myMatch'})
-      return
    }
  })
 }
@@ -663,7 +664,7 @@ function getremark() {
 }
 function submitSJ() {
-  if(!lpName.value){
+  if (!lpName.value) {
    ElMessage.warning(language.value == 0 ? '请填写开票人' : 'Please fill in the invoice recipient')
    return
  }
@@ -715,7 +716,7 @@ const showSJ = () => {
 }
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .wePrice {
  font-size: 24px;
  font-weight: 400;