no message

@@ -91,6 +91,20 @@ export function getMyGroupList() {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+export function checkWdsf(query) {
+  return request({
+    url: `/league/wdsf/check`,
+    method: 'get',
+    params:query
+  })
+}
+export function registerSingle(data) {
+  return request({
+    url: `/pcRegisterSingleAboard`,
+    method: 'post',
+    data:data
+  })
+}
 
 
 // 根据Id获取我的团队
 // 根据Id获取我的团队
 export function getGroupInfo() {
 export function getGroupInfo() {
@@ -192,6 +206,12 @@ export function saveMyTeam(data) {
     data: data
     data: data
   })
   })
 }
 }
+export function withDrawByOrderId(orderId) {
+  return request({
+    url: `/league/signOrder/withDraw/${orderId}`,
+    method: 'post'
+  })
+}
 
 
 export function getMyOrderList(params) {
 export function getMyOrderList(params) {
   return request({
   return request({
@@ -208,10 +228,17 @@ export function getMySignListFromOrderList(orderId) {
   })
   })
 }
 }
 
 
-export function getMyOrderDetail(orderId) {
+// export function getMyOrderDetail(orderId) {
+//   return request({
+//     url: `/league/signOrder/getMyOrderDetail/${orderId}`,
+//     method: 'get'
+//   })
+// }
+export function getMyOrderDetail(query) {
   return request({
   return request({
-    url: `/league/signOrder/getMyOrderDetail/${orderId}`,
-    method: 'get'
+    url: `/league/signOrder/getOrderPayInfo`,
+    method: 'get',
+    params: query
   })
   })
 }
 }
 
 
@@ -460,6 +487,13 @@ export function getMySignInfoList(data) {
     params: data
     params: data
   })
   })
 }
 }
+export function exportCn(data) {
+  return request({
+    url: `/league/sign/exportCn`,
+    method: 'get',
+    params: data
+  })
+}
 export function saveMyGroupExtraInfo(data) {
 export function saveMyGroupExtraInfo(data) {
   return request({
   return request({
     url: `/league/competitionGroupInfo/saveMyGroupExtraInfo`,
     url: `/league/competitionGroupInfo/saveMyGroupExtraInfo`,

@@ -288,6 +288,8 @@ function getCode() {
 
 
 :deep(.el-input){height: 100%}
 :deep(.el-input){height: 100%}
 :deep(.el-form-item){height: 40px;}
 :deep(.el-form-item){height: 40px;}
+.home-menu .el-menu--horizontal > .el-menu-item{margin: 0 5px; font-size: 18px;}
+.home-menu .el-sub-menu .el-sub-menu__title{font-size: 18px;}
 .weiMenu.el-menu{
 .weiMenu.el-menu{
   border: none;
   border: none;
   :deep(.el-menu-item.is-active){color: var(--el-color-primary);}
   :deep(.el-menu-item.is-active){color: var(--el-color-primary);}

@@ -401,6 +401,12 @@ export const constantRoutes = [
         redirect: '/match/list',
         redirect: '/match/list',
         children: [
         children: [
           {
           {
+            path: 'commitDone/:orderId',
+            component: () => import('@/viewsPc/match/commitDone'),
+            name: 'commitDone',
+            meta: { title: '提交审核'}
+          },
+          {
             path: 'pay',
             path: 'pay',
             component: () => import('@/viewsPc/match/pay'),
             component: () => import('@/viewsPc/match/pay'),
             name: 'signPay',
             name: 'signPay',

@@ -278,6 +278,12 @@ export const constantRoutes = [
         redirect: '/match/list',
         redirect: '/match/list',
         children: [
         children: [
           {
           {
+            path: 'commitDone/:orderId',
+            component: () => import('@/viewsPc/match/commitDone'),
+            name: 'commitDone',
+            meta: { title: '提交审核'}
+          },
+          {
             path: 'pay',
             path: 'pay',
             component: () => import('@/viewsPc/match/pay'),
             component: () => import('@/viewsPc/match/pay'),
             name: 'signPay',
             name: 'signPay',

@@ -141,26 +141,27 @@ service.interceptors.response.use(
     if (code === 401) {
     if (code === 401) {
       if (!isRelogin.show) {
       if (!isRelogin.show) {
         isRelogin.show = true
         isRelogin.show = true
-        ElMessageBox.confirm(
-          '登录状态已过期，您可以继续留在该页面，或者重新登录',
-          '系统提示',
-          {
-            confirmButtonText: '好的',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        )
-          .then(() => {
-            isRelogin.show = false
-            useUserStore()
-              .logOut()
-              .then(() => {
-                location.reload()
-              })
-          })
-          .catch(() => {
-            isRelogin.show = false
-          })
+          ElMessage({ message: '登录状态已过期', type: 'error' })
+        // ElMessageBox.confirm(
+        //   '登录状态已过期，您可以继续留在该页面，或者重新登录',
+        //   '系统提示',
+        //   {
+        //     confirmButtonText: '好的',
+        //     cancelButtonText: '取消',
+        //     type: 'warning'
+        //   }
+        // )
+        //   .then(() => {
+        //     isRelogin.show = false
+        //     useUserStore()
+        //       .logOut()
+        //       .then(() => {
+        //         location.reload()
+        //       })
+        //   })
+        //   .catch(() => {
+        //     isRelogin.show = false
+        //   })
       }
       }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
     } else if (code === 500) {

 <template>
 <template>
-  <div>
+  <div class="mb20">
     <el-card :body-style="{'padding':'0'}">
     <el-card :body-style="{'padding':'0'}">
-      <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'机构基础信息':'Institutional Basic Information' }}</h3></div>
+      <div class="indexTitle">
+        <h3 class="leftboderTT" v-if="user.utype=='2'">{{ language==0?'机构基础信息':'Institutional Basic Information' }}</h3>
+        <h3 class="leftboderTT" v-if="user.utype=='1'">{{ language==0?'个人基础信息':'Personal Basic Information' }}</h3>
+      </div>
 <!--      uType字段 1 是个人 2是团体-->
 <!--      uType字段 1 是个人 2是团体-->
 <!--      {{user}}-->
 <!--      {{user}}-->
       <team-info :form="myform" :language="language" v-if="user.utype=='2'"/>
       <team-info :form="myform" :language="language" v-if="user.utype=='2'"/>
+      <div class="pd20">
+        <div class="d-form-border" style="margin-top: 0">
+        <el-form class="d-form" label-width="120">
+          <el-form-item :label="language==0?'用户名':'Account'">
+            {{user.userName}}
+          </el-form-item>
+          <el-form-item label="姓名" required>
+            <el-input v-model="myform.realName" />
+          </el-form-item>
+          <el-form-item label="性别" prop="sex" required>
+            <el-radio-group v-model="myform.sex">
+              <el-radio label="0" size="large">男</el-radio>
+              <el-radio label="1" size="large">女</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="证件类型">
+            <el-select v-model="myform.idcType" placeholder="请选择证件类型" style="width: 100%">
+              <el-option
+                  v-for="item in certificates"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="证件号码">
+            <el-input v-model="myform.idcCode"  @blur="checkCode"/>
+          </el-form-item>
+                  <el-form-item label="类型" prop="type">
+                    <el-select v-model="myform.type" placeholder="请选择" style="width: 100%;">
+                      <el-option label="业余" value="0" />
+                      <el-option label="专业" value="1" />
+                      <el-option label="大专院校" value="2" />
+                      <el-option label="其他" value="3" />
+                    </el-select>
+                  </el-form-item>
+          <el-form-item :label="language==0?'联系人邮箱':'Contact Email'" required prop="email">
+            <el-input v-model="myform.email" type="email" :placeholder="language==0?'请输入内容':''"/>
+          </el-form-item>
+        </el-form>
+          <div class="text-center">
+            <el-button type="primary" class="btn-lineG" round @click="save">{{ language==0?'确定修改':'Save' }}</el-button>
+          </div>
 
 
+        </div>
+      </div>
     </el-card>
     </el-card>
 
 
   </div>
   </div>
@@ -35,10 +83,10 @@ const activeName = ref('first')
 const myform = ref({
 const myform = ref({
   idcType: 0,
   idcType: 0,
   countryId: 240,
   countryId: 240,
-  nation: '汉族'
+  nation: '汉族',
+  realName:''
 })
 })
 const labelArr = ref([])
 const labelArr = ref([])
-const groupList = ref([])
 
 
 const certificates = ref([
 const certificates = ref([
   {
   {
@@ -60,8 +108,21 @@ onMounted(() => {
 })
 })
 
 
 function getData() {
 function getData() {
-  match.getGroupInfo().then(res => {
-    myform.value = res.data
+  if(props.user.utype=='2'){
+    match.getGroupInfo().then(res => {
+      myform.value = res.data
+    })
+  }
+  if(props.user.utype=='1'){
+    match.getMyPersonInfo().then(res => {
+      myform.value = res.data
+    })
+  }
+
+}
+function save(){
+  match.saveMyBaseInfo().then(res=>{
+
   })
   })
 }
 }
 function checkCode() {
 function checkCode() {

 <template>
 <template>
   <el-card class="mb20">
   <el-card class="mb20">
-    <div class="pad20">
-      <el-form :model="query" :inline="true">
-        <el-form-item label="赛事名称">
-          <el-input v-model="query.name" style="width: 214px;" @change="getList"/>
-        </el-form-item>
-        <el-form-item label="赛事时间">
-          <el-date-picker
-              v-model="cptPeriodArr"
-              format="YYYY-MM-DD" type="daterange"
-              value-format="YYYY-MM-DD" range-separator="至"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              @change="getList"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="getList">查询</el-button>
-          <el-button type="info" @click="reset(query)">重置</el-button>
-        </el-form-item>
-      </el-form>
-
       <div class="pd20">
       <div class="pd20">
-        <div class="matchItem" v-for="n in tableData" :key="n.id" @click="goDetail(n.id)">
+        <div class="matchItem" v-for="n in billList" :key="n.id">
+          <div class="status-po">
+            <span class="bg-pink" v-if="n.auditStatus=='0'">未提交</span>
+            <span class="bg-primary" v-if="n.auditStatus=='1'">待审核</span>
+            <span class="bg-blue" v-if="n.auditStatus=='2'">审核通过</span>
+            <span class="bg-danger" v-if="n.auditStatus=='3'">审核驳回</span>
+          </div>
           <el-row :gutter="15">
           <el-row :gutter="15">
             <el-col :lg="6" :md="8" :xl="10">
             <el-col :lg="6" :md="8" :xl="10">
-              <img class="mauto" :src="fillImgUrl(n.coverUrl)">
+              <img class="mauto w100" :src="fillImgUrl(n.coverUrl)">
             </el-col>
             </el-col>
             <el-col :lg="18" :md="16" :xl="14">
             <el-col :lg="18" :md="16" :xl="14">
-              <div class="info">
-                <h3>{{ n.name }}</h3>
-                <p class="ppl"><label>比赛时间：</label>{{ n.beginTime?.slice(0, 10) }} 至 {{ n.endTime?.slice(0, 10) }}
-                </p>
-                <p class="ppl"><label>地&ensp;&ensp;&ensp;&ensp;点：</label>{{ n.address }}</p>
-                <p class="ppl"><label>报名截止：</label>{{ n.signEndTime?.slice(0, 10) }}</p>
-
-                <p class="ppl"><label>联系人员：</label>{{ n.contactPerson }}</p>
-                <p class="ppl"><label>联系电话：</label>{{ n.contactTelno }}</p>
-                <p class="ppl"><label>邮&ensp;&ensp;&ensp;&ensp;箱：</label>{{ n.contactEmail }}</p>
-
-              </div>
+              <el-row>
+                <el-col :span="24">
+                  <h3>{{ n.name }}</h3>
+                </el-col>
+                <el-col :lg="8">
+                  <p class="ppl"><label>赛事类型：</label>{{ n.level }}</p>
+                  <p class="ppl"><label v-if="n.groupName">参赛队：</label>{{n.groupName}}</p>
+                </el-col>
+                <el-col :lg="8">
+                  <p class="ppl"><label>比赛时间：</label>{{ n.signBeginTime }}~{{n.signEndTime}}
+                  </p>
+                  <p class="ppl"><label>参赛运动员：</label>{{ n.signSize }} 人</p>
+                </el-col>
+                <el-col :lg="8">
+                  <p class="ppl"><label>报名时间：</label>{{ n.signBeginTime }}~{{n.signEndTime}}</p>
+                  <div class="btnbox">
+                    <el-button plain round type="primary" @click="goDetail(n)" v-if="n.auditStatus!='0'">详情</el-button>
+                    <el-button plain round type="primary" @click="continueSign(n)" v-if="n.auditStatus=='0'">继续报名</el-button>
+                    <el-button plain round type="primary" @click="withDraw(n)" v-if="n.auditStatus=='1'">取消报名</el-button>
+                    <el-button plain round type="primary" @click="continueSign(n)" v-if="n.auditStatus=='3'">重新报名</el-button>
+                    <el-button plain round type="primary" @click="goDetail(n)" v-if="n.auditStatus=='2'&&n.payStatus=='0'">缴费</el-button>
+                  </div>
+                </el-col>
+              </el-row>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
         </div>
         </div>
-      </div>
 
 
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="index" label="序号" width="80" align="center"/>
-        <el-table-column label="赛事名称" min-width="260">
-          <template #default="scope">
-            {{ scope.row.name }}
-          </template>
-        </el-table-column>
-        <el-table-column label="参赛队" min-width="260">
-          <template #default="scope">
-            <span v-if="scope.row.groupName">{{ scope.row.groupName }}</span>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="赛事开始时间" min-width="120">
-          <template #default="scope">{{ scope.row.beginTime.substring(0, 10) }}</template>
-        </el-table-column>
-        <el-table-column label="赛事结束时间" min-width="120">
-          <template #default="scope">{{ scope.row.endTime.substring(0, 10) }}</template>
-        </el-table-column>
-        <el-table-column label="审批状态" min-width="100" align="center">
-          <template #default="scope">
-            <el-tag v-if="scope.row.auditStatus=='1'" type="info">已提交</el-tag>
-            <el-tag v-if="scope.row.auditStatus=='2'" type="success">审核通过</el-tag>
-            <el-tag v-if="scope.row.auditStatus=='3'" type="danger">未通过</el-tag>
-            <el-tag v-if="scope.row.auditStatus=='4'" type="warning">已取消</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" fixed="right" class-name="small-padding" width="180">
-          <template #default="scope">
-            <el-button v-if="scope.row.auditStatus!='0'" type="text" @click="downloadVoucher(scope.row)">
-              下载报名凭证
-            </el-button>
-            <el-button type="text" @click="signRow(scope.row)">详情</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
+        <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="billList?.length == 0"/>
+
+      </div>
+      <paginationPc
           v-show="total > 0"
           v-show="total > 0"
           v-model:page="query.pageNum"
           v-model:page="query.pageNum"
           v-model:limit="query.pageSize"
           v-model:limit="query.pageSize"
           :total="total"
           :total="total"
           @pagination="getList"
           @pagination="getList"
       />
       />
-    </div>
 
 
     <!--    报项详情-->
     <!--    报项详情-->
     <dialogModifySign :props="dialogModifySignProps"/>
     <dialogModifySign :props="dialogModifySignProps"/>
@@ -109,15 +70,12 @@ import dialogModifyBill from './component/modifyBill'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import _ from 'lodash'
 import _ from 'lodash'
+import useUserStore from "@/store/modules/user";
 
 
 const router = useRouter()
 const router = useRouter()
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
 const total = ref(0)
 const total = ref(0)
 const total2 = ref(0)
 const total2 = ref(0)
-const payMationDone = () => {
-  showOrganizerInfo.value = false
-  payPop.value = false
-}
 const dialogPropsBase = {
 const dialogPropsBase = {
   open: false,
   open: false,
   isView: false,
   isView: false,
@@ -155,10 +113,10 @@ const showResult = ref(false)
 const myBalance = ref('')
 const myBalance = ref('')
 const nowBill = ref({})
 const nowBill = ref({})
 const org = ref({})
 const org = ref({})
-
+const user = useUserStore().user
+const group = useUserStore().group
 onMounted(() => {
 onMounted(() => {
   getList()
   getList()
-  getBillList()
 })
 })
 const reset = (form) => {
 const reset = (form) => {
   query.value = {
   query.value = {
@@ -172,32 +130,53 @@ const reset = (form) => {
   cptPeriodArr.value = []
   cptPeriodArr.value = []
   payTimeArr.value = []
   payTimeArr.value = []
   commitTimeArr.value = []
   commitTimeArr.value = []
-  getBillList()
   getList()
   getList()
 }
 }
-
-
-function wePayDone() {
-  payPop.value = false
-  getBillList()
-  getList()
+function withDraw(n){
+  match.withDrawByOrderId(n.orderId).then(res=>{
+    getList()
+  })
 }
 }
-
-function getList() {
-  if (cptPeriodArr.value) {
-    query.value.cptPeriod = cptPeriodArr.value.toString()
+function continueSign(n){
+  if (user.utype == '1') {
+    // 个人报名
+    router.push({
+      name: 'chooseProject',
+      params:{
+        id: n.id
+      },
+      query: {
+        matchId: n.id
+      }
+    })
+  }
+  if (user.utype == '2'){
+    // 团队报名
+    router.push({
+      name: 'chooseSportsman',
+      params:{
+        id: n.id
+      },
+      query: {
+        matchId: n.id,
+        groupId: group.id
+      }
+    })
   }
   }
-  // match.getMySignCptList(query.value).then(res => {
-  //   tableData.value = res.rows
-  //   total.value = res.total
-  // })
-}
 
 
-function getBillList() {
-  query2.value.payTimeRange = payTimeArr.value.toString()
-  query2.value.createTimeRange = commitTimeArr.value.toString()
+}
+function goDetail(n){
+  // 查看详情
+  router.push({
+    name:`signPay`,
+    query: {
+      orderId: n.encodeOrderId
+    }
+  })
+}
+function getList() {
   console.log(query2.value)
   console.log(query2.value)
-  match.getMyOrderList(query2.value).then(res => {
+  match.getMySignCptList(query2.value).then(res => {
     billList.value = res.rows
     billList.value = res.rows
     total2.value = res.total
     total2.value = res.total
   })
   })
@@ -261,7 +240,6 @@ function cancelBill(bill) {
     match.cancelMyUnPayedOrder(bill.id).then(Response => {
     match.cancelMyUnPayedOrder(bill.id).then(Response => {
       console.log(Response.data)
       console.log(Response.data)
       // 刷新数据
       // 刷新数据
-      getBillList()
       getList()
       getList()
     })
     })
   })
   })
@@ -278,11 +256,16 @@ function downloadVoucher(row) {
 .matchItem {
 .matchItem {
   cursor: pointer;
   cursor: pointer;
   margin: 0 0 20px;
   margin: 0 0 20px;
-  padding: 0 0 20px;
-  background: #FFFFFF;
-  border-bottom: 1px solid #e5e5e5;
+  padding: 0 0 20px;background: #FBFCFD;
+  border-radius: 2px;
   position: relative;
   position: relative;
-
+  .status-po{position: absolute;right: 0;top: 0;font-size: 12px;
+    color: #FFFFFF;
+    span{border-radius: 0px 10px 0px 10px;padding: 4px 10px;}
+    .bg-danger{background: #E60012;}
+    .bg-pink{background: #F740A6;}
+    .bg-primary{background: var(--el-color-primary)}
+  }
   &:last-child {
   &:last-child {
     border-bottom: none;
     border-bottom: none;
   }
   }
@@ -368,4 +351,8 @@ function downloadVoucher(row) {
 .el-form--inline .el-form-item {
 .el-form--inline .el-form-item {
   width: auto;
   width: auto;
 }
 }
+.ppl{font-size: 14px;
+  label{color: #929AA0;}
+}
+.btnbox{text-align: right;}
 </style>
 </style>

+<template>
+  <el-card class="mb20">
+    <div class="pad20">
+<!--      <el-form :model="query" :inline="true">-->
+<!--        <el-form-item label="赛事名称">-->
+<!--          <el-input v-model="query.name" style="width: 214px;" @change="getBillList"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="赛事时间">-->
+<!--          <el-date-picker-->
+<!--              v-model="cptPeriodArr"-->
+<!--              format="YYYY-MM-DD" type="daterange"-->
+<!--              value-format="YYYY-MM-DD" range-separator="至"-->
+<!--              start-placeholder="开始时间"-->
+<!--              end-placeholder="结束时间"-->
+<!--              @change="getBillList"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
+<!--          <el-button type="primary" @click="getBillList">查询</el-button>-->
+<!--          <el-button type="info" @click="reset(query)">重置</el-button>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+
+      <div class="pd20">
+        <div class="matchItem" v-for="n in billList" :key="n.id" @click="goDetail(n.id)">
+          <div class="status-po">
+            <span class="bg-pink" v-if="n.auditStatus=='0'">未提交</span>
+            <span class="bg-primary" v-if="n.auditStatus=='1'">待审核</span>
+            <span class="bg-blue" v-if="n.auditStatus=='2'">审核通过</span>
+            <span class="bg-danger" v-if="n.auditStatus=='3'">审核驳回</span>
+          </div>
+          <el-row :gutter="15">
+            <el-col :lg="6" :md="8" :xl="10">
+              <img class="mauto w100" :src="fillImgUrl(n.cptCoverPic)">
+            </el-col>
+            <el-col :lg="18" :md="16" :xl="14">
+              <el-row>
+                <el-col :span="24">
+                  <h3>{{ n.cptName }}</h3>
+                </el-col>
+                <el-col :lg="8">
+                  <p class="ppl"><label>赛事类型：</label>{{ n.cptLevel }}</p>
+                  <p class="ppl"><label v-if="n.groupName">参赛队：</label>{{n.groupName}}</p>
+                </el-col>
+                <el-col :lg="8">
+                  <p class="ppl"><label>比赛时间：</label>{{ n.cptTimeRange }}
+                  </p>
+                  <p class="ppl"><label>参赛运动员：</label>{{ n.cptAthletesSize }} 人</p>
+                </el-col>
+                <el-col :lg="8">
+                  <p class="ppl"><label>报名时间：</label>{{ n.cptSignTimeRange}}</p>
+                  <div class="btnbox">
+                    <el-button plain round type="primary" @click="goDetail(n)" v-if="n.auditStatus!='0'">详情</el-button>
+                    <el-button plain round type="primary" @click="continueSign(n)" v-if="n.auditStatus=='0'">继续报名</el-button>
+                    <el-button plain round type="primary" @click="withDraw(n)" v-if="n.auditStatus=='1'">取消报名</el-button>
+                    <el-button plain round type="primary" v-if="n.auditStatus=='3'">重新报名</el-button>
+                    <el-button plain round type="primary" v-if="n.auditStatus=='2'&&n.payStatus=='0'">缴费</el-button>
+                  </div>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+        </div>
+
+        <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="billList?.length == 0"/>
+
+      </div>
+      <paginationPc
+          v-show="total > 0"
+          v-model:page="query.pageNum"
+          v-model:limit="query.pageSize"
+          :total="total"
+          @pagination="getBillList"
+      />
+    </div>
+
+    <!--    报项详情-->
+    <dialogModifySign :props="dialogModifySignProps"/>
+    <!--    订单详情-->
+    <dialogModifyBill :props="dialogModifyBillProps"/>
+
+  </el-card>
+
+</template>
+
+<script setup>
+import {ref} from 'vue'
+import {useRouter} from 'vue-router'
+import {getCurrentInstance, onMounted} from '@vue/runtime-core'
+import dialogModifySign from './component/modifySign'
+import dialogModifyBill from './component/modifyBill'
+import * as match from '@/apiPc/match'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import _ from 'lodash'
+import useUserStore from "@/store/modules/user";
+
+const router = useRouter()
+const {proxy} = getCurrentInstance()
+const total = ref(0)
+const total2 = ref(0)
+const dialogPropsBase = {
+  open: false,
+  isView: false,
+  title: '',
+  data: null
+}
+const dialogModifySignProps = ref({
+  ...dialogPropsBase
+})
+const dialogModifyBillProps = ref({
+  ...dialogPropsBase
+})
+const activeName = ref('first')
+const myform = ref({})
+
+const groupList = ref([])
+const cptPeriodArr = ref([])
+const payTimeArr = ref([])
+const commitTimeArr = ref([])
+const countryList = ref([])
+const tableData = ref([{name: '111'}])
+const billList = ref([])
+const query = ref({
+  pageNum: 1,
+  pageSize: 10
+})
+const query2 = ref({
+  pageNum: 1,
+  pageSize: 10
+})
+const payType = ref('')
+const payPop = ref(false)
+const showOrganizerInfo = ref(false)
+const showResult = ref(false)
+const myBalance = ref('')
+const nowBill = ref({})
+const org = ref({})
+const user = useUserStore().user
+const group = useUserStore().group
+onMounted(() => {
+  getBillList()
+})
+const reset = (form) => {
+  query.value = {
+    pageNum: 1,
+    pageSize: 10
+  }
+  query2.value = {
+    pageNum: 1,
+    pageSize: 10
+  }
+  cptPeriodArr.value = []
+  payTimeArr.value = []
+  commitTimeArr.value = []
+  getBillList()
+}
+function withDraw(n){
+  match.withDrawByOrderId(n.id).then(res=>{
+    getBillList()
+  })
+}
+function continueSign(n){
+  if (user.uType == '1') {
+    // 个人报名
+    router.push({
+      name: 'chooseProject',
+      query: {
+        matchId: n.cptId
+      }
+    })
+  }
+  if (user.uType == '2'){
+    // 团队报名
+    router.push({
+      name: 'chooseSportsman',
+      query: {
+        matchId: n.cptId,
+        groupId: group.id
+      }
+    })
+  }
+
+}
+function goDetail(n){
+
+}
+function getBillList() {
+  query2.value.payTimeRange = payTimeArr.value.toString()
+  query2.value.createTimeRange = commitTimeArr.value.toString()
+  console.log(query2.value)
+  match.getMyOrderList(query2.value).then(res => {
+    billList.value = res.rows
+    total2.value = res.total
+  })
+}
+
+function signRow(row) {
+  _.assign(dialogModifySignProps.value, dialogPropsBase, {
+    open: true,
+    isView: true,
+    title: '报项详情',
+    data: {...row}
+  })
+}
+
+// function getMemberInfoByCptId(cptId) {
+//   match.getMemberInfoByCptId(cptId).then((res) => {
+//     myBalance.value = res.data.balance
+//   })
+// }
+
+function goPay(bill) {
+  console.log(bill)
+  payPop.value = true
+  nowBill.value = bill
+  // getMemberInfoByCptId(bill.cptId)
+}
+
+function payBill() {
+  if (!payType.value) {
+    ElMessage.error('请选择支付方式')
+    return
+  }
+  match.payMatch({orderId: nowBill.value.id, payType: payType.value}).then(res => {
+    if (payType.value == 2) {
+      org.value = res.data.org
+      showOrganizerInfo.value = true
+    } else if (payType.value == 1) {
+      // 微信
+      proxy.$refs['wePayRef'].open(res.data)
+    } else {
+      showResult.value = true
+    }
+  })
+}
+
+function billDetail(bill) {
+  _.assign(dialogModifyBillProps.value, dialogPropsBase, {
+    open: true,
+    isView: true,
+    title: '订单详情',
+    data: {...bill}
+  })
+}
+
+function cancelBill(bill) {
+  ElMessageBox.confirm('确定取消订单吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    match.cancelMyUnPayedOrder(bill.id).then(Response => {
+      console.log(Response.data)
+      // 刷新数据
+      getBillList()
+    })
+  })
+}
+
+function downloadVoucher(row) {
+  proxy.download(
+      `/ztx-match/pdf/getPayedOrderPdf/${row.id}/${row.groupId || 0}`, {}, '报项凭证.pdf'
+  )
+}
+</script>
+
+<style scoped lang="scss">
+.matchItem {
+  cursor: pointer;
+  margin: 0 0 20px;
+  padding: 0 0 20px;background: #FBFCFD;
+  border-radius: 2px;
+  position: relative;
+  .status-po{position: absolute;right: 0;top: 0;font-size: 12px;
+    color: #FFFFFF;
+    span{border-radius: 0px 10px 0px 10px;padding: 4px 10px;}
+    .bg-danger{background: #E60012;}
+    .bg-pink{background: #F740A6;}
+    .bg-primary{background: var(--el-color-primary)}
+  }
+  &:last-child {
+    border-bottom: none;
+  }
+
+  .el-avatar {
+    position: absolute;
+    left: 20px;
+    top: 30px;
+
+    img {
+      background: #fff;
+    }
+  }
+
+  .info {
+    p {
+      font-size: 14px;
+    }
+  }
+
+  .typeTag {
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+
+  h3 {
+    font-weight: 500;
+    margin: 0 0 10px;
+    font-size: 18px;
+    color: #000000;
+    text-overflow: ellipsis;
+  }
+
+  &:hover h3 {
+    color: var(--el-color-primary);
+  }
+}
+
+.centerPrice {
+  text-align: center;
+  font-size: 26px;
+  margin: 20px;
+
+  span {
+    font-size: 40px;
+    font-weight: bold;
+  }
+}
+
+
+:deep(.el-tabs__nav-wrap) {
+  padding: 0 15px;
+}
+
+:deep(.el-radio.el-radio--large .el-radio__label) {
+  display: flex;
+  align-items: center;
+
+  img {
+    margin-right: 6px;
+  }
+}
+
+.panel-footer .el-button--success {
+  background: #254385;
+  border: none;
+  padding: 0 40px;
+  font-size: 16px;
+}
+
+.orange {
+  font-size: 16px;
+  font-style: normal;
+  font-weight: bold
+}
+
+.orgbox {
+  font-size: 16px;
+  line-height: 30px;
+}
+
+.el-form--inline .el-form-item {
+  width: auto;
+}
+.ppl{font-size: 14px;
+  label{color: #929AA0;}
+}
+.btnbox{text-align: right;}
+</style>

@@ -3,9 +3,6 @@
     <div class="funcBtns">
     <div class="funcBtns">
       <el-button type="primary" @click="addMember">{{ language==0?'添加选手':'Add Player'}}</el-button>
       <el-button type="primary" @click="addMember">{{ language==0?'添加选手':'Add Player'}}</el-button>
       <el-button type="primary" plain @click="importSportman">{{  language==0?'导入选手':'Import Player' }}</el-button>
       <el-button type="primary" plain @click="importSportman">{{  language==0?'导入选手':'Import Player' }}</el-button>
-      <el-button type="primary" plain>
-        <a href="/file/sportsmanTemplate.xlsx" target="_blank">Download template</a>
-      </el-button>
     </div>
     </div>
     <div class="from-Card">
     <div class="from-Card">
       <el-form :inline="true" :model="query" class="mt20" label-width="60" size="small">
       <el-form :inline="true" :model="query" class="mt20" label-width="60" size="small">
@@ -28,7 +25,7 @@
           <el-input v-model="query.idcode" style="width: 120px;" clearable/>
           <el-input v-model="query.idcode" style="width: 120px;" clearable/>
         </el-form-item>
         </el-form-item>
         <el-form-item :label="language==0?'会员角色':'Role'">
         <el-form-item :label="language==0?'会员角色':'Role'">
-          <el-select v-model="query.label" multiple>
+          <el-select v-model="labelArr" multiple>
             <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/>
             <el-option v-for="l in labels" :key="l.value" :value="l.value" :label="language==0?(l.label):(l.enlabel)"/>
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
@@ -51,7 +48,7 @@
 
 
   <!--    添加人员-->
   <!--    添加人员-->
   <addCoach ref="dialogAddCoach" @submitForm="getList"/>
   <addCoach ref="dialogAddCoach" @submitForm="getList"/>
-  <Import ref="dialogImportProps"/>
+  <Import ref="dialogImportProps" @uploadSuccess="getList"/>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
@@ -72,6 +69,7 @@ import cache from "@/plugins/cache";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 const language = ref(cache.local.get('language') || 0)
 const language = ref(cache.local.get('language') || 0)
 const tableData = ref([])
 const tableData = ref([])
+const labelArr = ref([])
 const labels = ref([
 const labels = ref([
   {value: '0', label: '运动员', enlabel: 'Sportsman'},
   {value: '0', label: '运动员', enlabel: 'Sportsman'},
   {value: '1', label: '教练', enlabel: 'Coach'},
   {value: '1', label: '教练', enlabel: 'Coach'},
@@ -109,6 +107,7 @@ function importSportman() {
 }
 }
 
 
 function getList() {
 function getList() {
+  query.value.label =labelArr.value.toString()
   getGroupPersonList(query.value, groupId.value).then(res => {
   getGroupPersonList(query.value, groupId.value).then(res => {
     tableData.value = res.rows
     tableData.value = res.rows
     total.value = res.total
     total.value = res.total

@@ -2,7 +2,7 @@
   <div>
   <div>
     <el-card :body-style="{'padding':'0'}">
     <el-card :body-style="{'padding':'0'}">
       <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'我的预订':'My reservation' }}</h3></div>
       <div class="indexTitle"><h3 class="leftboderTT">{{ language==0?'我的预订':'My reservation' }}</h3></div>
-      <el-empty image="@/assets/img/order_no.png" image-size="228"  v-if="list?.length == 0"/>
+      <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="list?.length == 0"/>
 
 
       <div class="pd20"></div>
       <div class="pd20"></div>
     </el-card>
     </el-card>

@@ -10,7 +10,7 @@
           <span>{{ n.time }}</span>
           <span>{{ n.time }}</span>
         </li>
         </li>
       </ul>
       </ul>
-      <el-empty image="@/assets/img/order_no.png" image-size="228"  v-if="list?.length == 0"/>
+      <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="list?.length == 0"/>
 
 
     </el-card>
     </el-card>
   </div>
   </div>

@@ -80,7 +80,6 @@
           <!--赛事日历-->
           <!--赛事日历-->
           <el-card :body-style="{'padding':'20px 20px'}">
           <el-card :body-style="{'padding':'20px 20px'}">
             <el-calendar v-model="calendarValue" :range="calendarRange">
             <el-calendar v-model="calendarValue" :range="calendarRange">
-<!--            <el-calendar>-->
               <template #date-cell="data">
               <template #date-cell="data">
                 <div v-if="data.data.day.slice(8,10)==22" class="primaryDate date">22</div>
                 <div v-if="data.data.day.slice(8,10)==22" class="primaryDate date">22</div>
                 <div v-else class="date">
                 <div v-else class="date">
@@ -417,8 +416,8 @@ const scores = ref([])
 const nowscores = ref([])
 const nowscores = ref([])
 const livelist = ref([])
 const livelist = ref([])
 const picList = ref([])
 const picList = ref([])
-const calendarValue = ref('2024-07-22')
-const calendarRange = ref(['2024-07-21','2024-07-27'])
+const calendarValue = ref(dayjs('2024-07-22').toDate())
+const calendarRange = ref([dayjs('2024-07-21').toDate(),dayjs('2024-07-27').toDate()])
 const showgg = ref(true)
 const showgg = ref(true)
 onMounted(() => {
 onMounted(() => {
   init()
   init()

@@ -82,7 +82,7 @@
       <div class="rItem r1" @click="goRegister(1)">
       <div class="rItem r1" @click="goRegister(1)">
         <h3>{{language==0?'机构用户':'Organization'}}</h3>
         <h3>{{language==0?'机构用户':'Organization'}}</h3>
       </div>
       </div>
-      <div class="rItem r2" @click="goRegister(0)">
+      <div class="rItem r2" @click="goRegister(0)" :style="language==0?'filter:grayscale(1)':''">
         <h3>{{language==0?'个人用户':'Individual'}}</h3>
         <h3>{{language==0?'个人用户':'Individual'}}</h3>
       </div>
       </div>
     </div>
     </div>
@@ -293,6 +293,10 @@ function showRegister() {
 }
 }
 function goRegister(n) {
 function goRegister(n) {
   if(n==0){
   if(n==0){
+    if(language.value==0){
+      // ElMessage.warning('暂不开放国内注册！')
+      return
+    }
     show.value = false
     show.value = false
     router.push({
     router.push({
       path: `/register/0`
       path: `/register/0`

@@ -3,7 +3,8 @@
 
 
     <div class="box ph-30">
     <div class="box ph-30">
       <el-card>
       <el-card>
-        <team-sign-step :activeStep="activeStep" :language="language"/>
+        <single-sign-step v-if="user.utype=='1'" activeStep="1" :language="language"/>
+        <team-sign-step v-if="user.utype=='2'" activeStep="2" :language="language"/>
       </el-card>
       </el-card>
 
 
       <el-row class="mt20" :gutter="20">
       <el-row class="mt20" :gutter="20">
@@ -166,17 +167,19 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import {ref, reactive} from 'vue'
+import TeamSignStep from './components/teamSignStep'
+import SingleSignStep from './components/singleSignStep'
+import {ref, reactive,toRefs} from 'vue'
 import {getCurrentInstance, onMounted} from '@vue/runtime-core'
 import {getCurrentInstance, onMounted} from '@vue/runtime-core'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import dialogAddCoach from './components/addCoach'
 import dialogAddCoach from './components/addCoach'
-import TeamSignStep from './components/teamSignStep'
-import cache from "@/plugins/cache"
+   import cache from "@/plugins/cache"
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
 import {ElMessage} from 'element-plus'
 import {ElMessage} from 'element-plus'
 import {useRoute, useRouter} from 'vue-router'
 import {useRoute, useRouter} from 'vue-router'
+import useUserStore from "@/store/modules/user";
 const language = ref(cache.local.get('language') || 0)
 const language = ref(cache.local.get('language') || 0)
 
 
 const data = reactive({
 const data = reactive({
@@ -209,17 +212,21 @@ const {
   hasChooseObj,activeStep
   hasChooseObj,activeStep
 } = toRefs(data)
 } = toRefs(data)
 let matchId = ''
 let matchId = ''
+const user = useUserStore().user
+const uType = ref('')
 onMounted(() => {
 onMounted(() => {
   matchId = route.query.matchId
   matchId = route.query.matchId
-  groupId.value = route.query.groupId
+  groupId.value = route.query.groupId || 0
   signType.value = route.query.signType || ''
   signType.value = route.query.signType || ''
+
   getList()
   getList()
 })
 })
 
 
 function getList() {
 function getList() {
-  if (signType.value == '0') {
+  if (user.utype == '1') {
     geren()
     geren()
-  } else {
+  }
+  if (user.utype == '2'){
     tuandui()
     tuandui()
   }
   }
 }
 }
@@ -297,7 +304,7 @@ function chooseDone() {
 function goNext() {
 function goNext() {
   console.log(form.value)
   console.log(form.value)
   if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
   if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
-    ElMessage.error('至少选一个教练或领队')
+    ElMessage.error(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
     return
     return
   }
   }
   var obj = {
   var obj = {
@@ -315,7 +322,7 @@ function goNext() {
   if (groupId.value && groupId.value != 0) {
   if (groupId.value && groupId.value != 0) {
     obj.unitId = groupId.value
     obj.unitId = groupId.value
   }
   }
-  if (signType.value == '0') {
+  if (user.utype == '1') {
     // 个人报名
     // 个人报名
     match.singleSignSavePerson(obj).then(res => {
     match.singleSignSavePerson(obj).then(res => {
       console.log(res)
       console.log(res)
@@ -326,7 +333,8 @@ function goNext() {
         }
         }
       })
       })
     })
     })
-  } else {
+  }
+  if (user.utype == '2'){
     // 团队报名
     // 团队报名
     match.groupSignSavePerson(obj).then(res => {
     match.groupSignSavePerson(obj).then(res => {
       router.push({
       router.push({
@@ -349,7 +357,7 @@ function goPrev() {
 
 
 function editPerson(id) {
 function editPerson(id) {
   proxy.$refs['dialogAddCoachRef'].open({
   proxy.$refs['dialogAddCoachRef'].open({
-    title: '编辑人员',
+    title: language.value==0?'编辑人员':'Edit',
     id: id,
     id: id,
     groupId: groupId.value
     groupId: groupId.value
   })
   })
@@ -357,7 +365,7 @@ function editPerson(id) {
 
 
 function addCoach() {
 function addCoach() {
   proxy.$refs['dialogAddCoachRef'].open({
   proxy.$refs['dialogAddCoachRef'].open({
-    title: '新建人员',
+    title: language.value==0?'新建人员':'Add',
     id: 0,
     id: 0,
     groupId: groupId.value
     groupId: groupId.value
   })
   })

 <template>
 <template>
-  <div class="app-container">
-
+  <div>
     <div class="box ph-30">
     <div class="box ph-30">
-      <div class="panel">
-        <div class="panel-header">
-          <h3 class="panel-title">选择参赛项目</h3>
-        </div>
-        <div class="panel-body">
-
-          <div class="text-right mb20">
-            <el-button type="success" @click="chooseProject">选择项目</el-button>
-          </div>
-          <el-table border :data="tableData" style="width: 100%">
-            <el-table-column type="index" label="序号" width="50" />
-            <el-table-column label="运动员" min-width="120">
-              <template #default="scope">
-                <div class="td-flex">
-                  <img width="50" :src="scope.row.cptPersonInfo.picUrl">
-                  <div class="info">
-                    {{ scope.row.cptPersonInfo.realName }}({{ scope.row.cptPersonInfo.sexStr }})
-                  </div>
+      <el-card class="mb20">
+        <single-sign-step :activeStep="2" :language="language"/>
+      </el-card>
+
+      <el-card :body-style="{'padding': '0'}">
+        <match-info-row :match-id="matchId"/>
+        <div class="pd20">
+          <el-row :gutter="20">
+            <el-col :lg="4">
+              <div class="panel border">
+                <div class="panel-header ">
+                  <h3 class="panel-title" v-if="language==0">完善我的信息</h3>
+                  <h3 class="panel-title" v-else>My Information</h3>
                 </div>
                 </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="证件号" min-width="150">
-              <template #default="scope">
-                {{ scope.row.cptPersonInfo.idcTypeStr }}
-                <p class="m0">{{ scope.row.cptPersonInfo.idcCode }}</p>
-              </template>
-            </el-table-column>
-            <el-table-column label="项目/组别/级别" min-width="150">
-              <template #default="scope">
-
-                {{ scope.row.cptProjectName }}&ensp;{{ scope.row.cptGroupName }}{{ scope.row.cptLevelName }}
-              </template>
-            </el-table-column>
-            <el-table-column v-for="(p,index) in extraPersonInfoMapList" :key="index" :label="p.key">
-              <template #default="scope">
-                <el-link v-if="p.type=='2'" type="success" :herf="scope.row.extraPersonInfoMapList[index].value">
-                  文件
-                </el-link>
-                <img v-else-if="p.type=='3'" style="width: 50px;" :src="scope.row.extraPersonInfoMapList[index].value">
-                <span v-else>{{ scope.row.extraPersonInfoMapList[index].value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="国籍" prop="cptPersonInfo.countryName" />
-            <el-table-column label="民族" prop="cptPersonInfo.nation" />
-            <el-table-column label="联系电话" min-width="110" prop="cptPersonInfo.phone" />
-            <el-table-column label="出生日期" min-width="100" prop="cptPersonInfo.birth" />
-
-            <el-table-column v-if="coachOrLeaderFlag==1" label="教练">
-              <template #default="scope">
-                <div class="hand" @click="chooseCoach">{{ scope.row.coachNames }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column v-if="coachOrLeaderFlag==1" label="领队">
-              <template #default="scope">
-                <div class="hand" @click="chooseCoach">{{ scope.row.leaderNames }}</div>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="操作" align="center" fixed="right" width="100">
-              <template #default="scope">
-                <!--                <el-button type="text">编辑</el-button>-->
-                <el-button type="text" @click="removeThis(scope.row)">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+                <div class="panel-body">
+                  <div class="chooseForm">
+                    <div @click="editPerson" style="width: 60px">
+                      <el-avatar fit="cover" v-if="form.picUrl" :size="60" :src="fillImgUrl(form.picUrl)"/>
+                      <div class="addBttn" v-else>+</div>
 
 
+                      <div class="text-center mt10">
+                        <span v-if="form.shortName">{{form.shortName}}</span>
+                        <el-icon>
+                          <Edit/>
+                        </el-icon>
+                      </div>
 
 
+                    </div>
+
+                  </div>
+                </div>
+              </div>
+            </el-col>
+
+            <el-col :lg="20">
+              <div class="panel border">
+                <div class="panel-header ">
+                  <h3 class="panel-title" v-if="language==0">可参与报名的项目</h3>
+                  <h3 class="panel-title" v-else>Eligible Events for Registration</h3>
+                  <div class="fr">
+                    <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search" @change="getProjectList"
+                              clearable/>
+                  </div>
+                </div>
+                <div v-loading="loadingProject" style="min-height: 200px;max-height: 60vh">
+                  <el-checkbox-group v-model="projectIds">
+                    <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id">
+                      <div class="flexBetween w100">
+                        <div class="l">
+                          {{ c.code }}:{{ c.name }}
+                          <div>{{ c.danceTypeDetailStr }}</div>
+                        </div>
+                        <div class="text-primary">¥{{ c.serviceFee }}</div>
+                      </div>
+                    </el-checkbox>
+                  </el-checkbox-group>
+                  <el-empty v-if="projectList.length==0" image="@/assets/img/order_no.png" :image-size="228"
+                            :description="language==0?'无可选项目':''"/>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
         </div>
         </div>
-        <div class="panel-footer text-center">
-          <el-button type="success" plain round @click="goPrev()">上一步</el-button>
-          <el-button type="success" round @click="submitForm()">下一步</el-button>
+        <el-row class="mt20">
+          <el-col :span="24">
+            <div class="text-center">
+              <el-button type="primary" class="btn-lineG w200px" round @click="signUp">
+                {{ language == 0 ? '确定' : 'Confirm' }}
+              </el-button>
+            </div>
+          </el-col>
+        </el-row>
+
+        <div class="m20">
+          <!--            <el-button type="success" @click="importSportman">批量导入人员</el-button>-->
+          <!--            <el-button type="success" @click="addCoach">新增运动员</el-button>-->
+          <div class="ttbb">
+            <div :class="tableType==1 ? 'active' : ''" @click="switchTabletype">
+              {{ language == 0 ? '按组别查看报项' : 'View Entries by Group' }}
+            </div>
+            <div :class="tableType==0 ? 'active' : ''" @click="switchTabletype">
+              {{ language == 0 ? '按人员查看报项' : 'View Entries by Participant' }}
+            </div>
+          </div>
+          <sign-info-table v-if="tableType==0" :match-id="matchId"
+                           :extraform="extraform" :language="language" :list="signInfoList"
+                           @editExtra="goPersonInfo"/>
+          <zu-table v-else :list="zuTableList" :language="language" @delete="removeThis"/>
+          <div class="text-center mt20">
+            <el-button type="primary" class="" plain round @click="submitForm(0)">{{ language==0?'保存暂不提交审核':'Save, Do Not Submit for Review Yet' }}</el-button>
+            <el-button type="primary" class="btn-lineG w200px" round @click="submitForm(1)">{{ language==0?'提交审核':'Submit for review' }}</el-button>
+          </div>
         </div>
         </div>
-      </div>
+      </el-card>
     </div>
     </div>
 
 
-    <dialogProjectList ref="dialogProjectListRef" @submitForm="getMySignInfo" />
+    <dialogAddCoach ref="dialogAddCoachRef" @submitForm="getProjectList"/>
+
 
 
-    <el-dialog v-model="showResult" :close-on-click-modal="false" :show-close="false">
-      <el-result
-        icon="success"
-        title="报名成功"
-      >
-        <template #extra>
-          <el-button type="primary" @click="downloadVoucher">下载凭证</el-button>
-          <el-button type="primary" @click="goMySign">查看报项</el-button>
-        </template>
-      </el-result>
+    <!--    <dialogChangeCoach ref="popChangeCoach" @submitForm="getMySignInfo"/>-->
 
 
-    </el-dialog>
+    <dialogExtraForm ref="popExtraForm" @submitForm="getSignInfoList"/>
   </div>
   </div>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import { ref, reactive } from 'vue'
-import { getCurrentInstance, onMounted } from '@vue/runtime-core'
+import {ref, reactive, toRefs} from 'vue'
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
-import dialogProjectList from './components/sportsmanList'
-import { useRoute, useRouter } from 'vue-router'
-
-const { proxy } = getCurrentInstance()
+import {getCurrentInstance, onMounted} from '@vue/runtime-core'
+import dialogAddCoach from './components/addCoach'
+import dialogSportsmanList from './components/sportsmanList'
+import dialogAllSportsmanList from './components/allSportsmanList'
+import dialogChangeCoach from './components/changeCoach'
+import dialogExtraForm from './components/extraForm'
+import dialogMates from './components/dialogMates'
+import {Search, Switch} from "@element-plus/icons-vue";
+
+const {proxy} = getCurrentInstance()
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
-import { ElMessage, ElMessageBox } from 'element-plus'
+import _ from 'lodash'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import cache from "@/plugins/cache"
+import TeamSignStep from "@/viewsPc/match/components/teamSignStep"
+import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row"
+import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
+import ZuTable from '@/viewsPc/match/components/zu-table'
+import SingleSignStep from "@/viewsPc/match/components/singleSignStep";
+import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row";
+import useUserStore from "@/store/modules/user";
+const language = ref(cache.local.get('language') || 0)
 
 
-let signInfoType
 const data = reactive({
 const data = reactive({
+  coachForm: {}, activeStep: 2,
   tableData: [],
   tableData: [],
+  signInfoList: [],
+  zuTableList: [],
+  choosedList: [],
   extraPersonInfoMapList: [],
   extraPersonInfoMapList: [],
-  matchId: '',
-  showResult: false
+  teamList: [],
+  extraform: [],
+  groupId: 0,
+  signType: '',
+  coachOrLeaderFlag: null,
+  noPhotoCanSign: null,
+  showResult: false,
+  showExtraForm: false,
+  loadingProject: false,
+  extraTableHead: [],
+  activeTeam: '',
+  names: {},
+  choosedchoosed: [],
+  projectIds: [],
+  projectList: [],
+  choosed2List: [], projectQuery: {}, tableType: 1,
 })
 })
-const { tableData, extraPersonInfoMapList, matchId, showResult } = toRefs(data)
-
-let chargeFlag
-const coachOrLeaderFlag = ref('')
-let noPhotoCanSign
+const {
+  activeTeam, names, tableData, signInfoList, zuTableList, choosedList, showExtraForm, extraPersonInfoMapList, teamList,
+  extraform, groupId, signType, coachOrLeaderFlag, showResult, noPhotoCanSign, extraTableHead,
+  coachForm, projectIds, choosedchoosed, activeStep, projectList, choosed2List, loadingProject, projectQuery, tableType
+} = toRefs(data)
+const matchId = ref(route.query.matchId)
+let signInfoType = null
+const form = ref({})
+const userId = ref('')
+const myId = ref('')
 onMounted(() => {
 onMounted(() => {
-  matchId.value = route.query.matchId
+  if(useUserStore().user){
+    userId.value = useUserStore().user.userId
+  }
+  signType.value = route.query.signType
+  getSignInfoList()
+  getMatch(matchId.value)
+  getMyInfo()
+
   getMySignInfo()
   getMySignInfo()
-  getMatch()
-  getMyself()
 })
 })
+function getMyInfo(){
+  match.getMyPersonInfo().then(res => {
+    form.value = res.data
+    myId.value = res.data.id
+    getProjectList()
+  })
+}
+let chargeFlag
 
 
-function getMatch() {
+function getMatch(id) {
   match.getMatchById({
   match.getMatchById({
-    id: matchId.value
+    id: id
   }).then(res => {
   }).then(res => {
     chargeFlag = res.data.chargeFlag
     chargeFlag = res.data.chargeFlag
+    noPhotoCanSign.value = res.data.noPhotoCanSign
     coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
     coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
-    noPhotoCanSign = res.data.noPhotoCanSign
+    extraform.value = JSON.parse(res.data.participantsInfo)
   })
   })
 }
 }
 
 
 function getMySignInfo() {
 function getMySignInfo() {
-  match.getMySignInfo({ cptId: matchId.value, groupId: '' }).then(res => {
-    console.log(res.data)
-    signInfoType = res.data.type
-    if (!res.data.signInfo) {
-      tableData.value = []
-      return
-    }
+  // 获取已报
+  match.getMySignInfo({
+    cptId: matchId.value,
+    groupId: 0
+  }).then(res => {
     tableData.value = res.data.signInfo
     tableData.value = res.data.signInfo
-    extraPersonInfoMapList.value = res.data.signInfo[0]?.extraPersonInfoMapList
+    signInfoType = res.data.type
   })
   })
 }
 }
 
 
-let personId
-const getMyself = () => {
-  match.getMyPersonInfo().then(res => {
-    personId = res.data.id
+function getSignInfoList() {
+  match.getMySignInfoList({
+    cptId: matchId.value,
+    groupId: 0
+  }).then(res => {
+    signInfoList.value = res.data.singleData || []
+    zuTableList.value = res.data.zuData || []
   })
   })
 }
 }
 
 
-function submitForm() {
+
+
+function submitForm(n) {
   if (signInfoType == '1') {
   if (signInfoType == '1') {
     ElMessageBox.confirm('已报项，前往我的报项', '提示', {
     ElMessageBox.confirm('已报项，前往我的报项', '提示', {
       confirmButtonText: '确定',
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       cancelButtonText: '取消',
       type: 'warning'
       type: 'warning'
     }).then(() => {
     }).then(() => {
-      router.push({ name: 'myMatch' })
+      router.push({name: 'myMatch'})
     })
     })
     return
     return
   }
   }
-  if (signInfoType == '2') {
-    match.recoverMySign({ cptId: matchId.value }).then(res => {
-      if (res.msg.indexOf('Exception:') > -1) {
-        const msg = res.msg.slice(10)
-        ElMessageBox.confirm(msg, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          console.log('用户点击确定')
-        })
-        return
-      } else {
-        afterRecover()
-      }
+  if(n==0){
+    ElMessageBox.confirm(`您当前的操作为暂存，并不是提交审核，必须在报名截止时间XXXX-XX-XX之前完成提交。\n` +
+        '\n' +
+        '您也可以在个人中心-我的报名中，找到这条报名，点击提交审核。','提示',{
+      confirmButtonText: '去个人中心',
+      cancelButtonText: '知道了',
+      type: 'warning'
+    }).then((res)=>{
+      console.log(res)
+      router.push({name: 'myMatch'})
     })
     })
   } else {
   } else {
-    afterRecover()
-  }
-}
+    if (extraform.value && extraform.value.length > 0) {
+      let needBuchong = false
+      for (const e of extraform.value) {
+        if (e.status == '0') {
+          needBuchong = true
+        }
+      }
+      for (const s of signInfoList.value) {
+        if (s.extraPersonInfo == null && needBuchong) {
+          ElMessage.error('请完善运动员补充信息')
+          tableType.value = 0
+          return
+        }
+      }
 
 
-function afterRecover() {
-  if (tableData.value.length == 0) {
-    ElMessage.error('请至少选择一个项目')
-    return
-  }
-  // 判断是否收费
-  if (chargeFlag == '0') {
-    var obj = {
-      cptId: matchId.value,
-      groupId: ''
+      commit()
     }
     }
-    match.commitSign(obj).then(res => {
-      console.log(res.data)
-      showResult.value = true
-    })
-  } else {
-    // 生成账单
+
+  }
+}
+function commit() {
+  match.commitSign({
+    groupId: 0,
+    cptId: matchId.value
+  }).then(res=>{
     router.push({
     router.push({
-      name: 'expenseDetails',
-      query: {
-        personId: personId
+      name:`commitDone`,
+      params: {
+        orderId: res.data
       }
       }
     })
     })
-  }
-}
-
-function goMySign() {
-  router.push({
-    name: 'myMatch'
   })
   })
 }
 }
 
 
-function goPrev() {
-  router.go(-1)
+function getProjectList() {
+  projectIds.value = []
+  loadingProject.value = true
+  //根据已选人员id 获取项目列表
+  var obj = {
+    cptId: matchId.value,
+    perIds: myId.value
+  }
+  match.getProjectPageByPerIds(obj).then(res => {
+    projectList.value = res.rows
+    loadingProject.value = false
+  }).catch(err => {
+    loadingProject.value = false
+    ElMessage.error(err.msg)
+  })
 }
 }
 
 
-function chooseProject() {
+function addCoach() {
   if (signInfoType == '2') {
   if (signInfoType == '2') {
-    match.recoverMySign({ cptId: matchId.value }).then(res => {
+    match.recoverMySign({
+      cptId: matchId.value,
+      groupId: groupId.value
+    }).then(res => {
       if (res.msg.indexOf('Exception:') > -1) {
       if (res.msg.indexOf('Exception:') > -1) {
         const msg = res.msg.slice(10)
         const msg = res.msg.slice(10)
-        ElMessageBox.confirm(msg).then(() => {
+        ElMessageBox.confirm(msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           console.log('用户点击确定')
           console.log('用户点击确定')
         })
         })
         return
         return
@@ -236,47 +315,134 @@ function chooseProject() {
       getMySignInfo()
       getMySignInfo()
     })
     })
   }
   }
-  match.getMyPersonInfo().then(res => {
-    console.log(res.data)
-    const params = {
-      title: '选择项目',
-      matchId: matchId.value,
-      groupId: 0,
-      personal: res.data,
-      signType: 0,
-      noPhotoCanSign: noPhotoCanSign,
-      coachOrLeaderFlag: coachOrLeaderFlag.value
-    }
-    proxy.$refs['dialogProjectListRef'].open(params)
+  const params = {
+    title: '新增运动员',
+    id: 0,
+    groupId: groupId.value
+  }
+  proxy.$refs['dialogAddCoachRef'].open(params)
+}
+
+
+function signUp() {
+  if (projectIds.value.length == 0) {
+    return
+  }
+  const obj = {
+    athleteIds:myId.value,
+    projectIds: projectIds.value.toString(),
+    groupId: groupId.value
+  }
+  match.sportsmanDone(obj).then(res => {
+    getSignInfoList()
+    getProjectList()
   })
   })
 }
 }
 
 
-function removeThis(p) {
+function removeThis(id) {
   ElMessageBox.confirm('确定移除这条报项吗？', '提示', {
   ElMessageBox.confirm('确定移除这条报项吗？', '提示', {
     confirmButtonText: '确定',
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     cancelButtonText: '取消',
     type: 'warning'
     type: 'warning'
   }).then(() => {
   }).then(() => {
-    match.deleteSign(p.id).then(res => {
+    match.deleteSign(id).then(res => {
       // 重新获取已报名信息
       // 重新获取已报名信息
       ElMessage.success('已移除该报项')
       ElMessage.success('已移除该报项')
-      getMySignInfo()
+      getSignInfoList()
     })
     })
   })
   })
 }
 }
 
 
-function chooseCoach() {
-  // goPrev()
+function changeCoach(cptId, groupId) {
+  // 更换教练
+  const params = {
+    title: '修改教练',
+    groupId: groupId,
+    cptId: cptId
+  }
+  proxy.$refs['popChangeCoach'].open(params)
+}
+
+
+function goMySign() {
+  router.push({
+    name: 'myMatch'
+  })
+}
+
+const goPersonInfo = (row) => {
+  if (signInfoType == '1') {
+    ElMessageBox.alert('已报项，前往我的报项', '提示', {
+      confirmButtonText: 'OK',
+      callback: (Action) => {
+        router.push({name: 'myMatch'})
+      }
+    })
+    return
+  }
+  // 完善补充信息
+  console.log(row)
+  // debugger
+  const params = {
+    title: '完善补充信息',
+    participantsInfoArr: extraform.value,
+    personId: row.personInfo.id,
+    extraId: row.extraPersonInfo?.id || 0
+  }
+  proxy.$refs['popExtraForm'].open(_.cloneDeep(params))
 }
 }
 
 
 function downloadVoucher() {
 function downloadVoucher() {
+  // 下载凭证
   proxy.download(
   proxy.download(
-    `/pdf/getPayedOrderPdf/${matchId.value}/0`, {}, '报项凭证.pdf'
+      `/pdf/getPayedOrderPdf/${matchId.value}/${groupId.value || 0}`, {}, '报项凭证.pdf'
   )
   )
 }
 }
+
+function editPerson() {
+  proxy.$refs['dialogAddCoachRef'].open({
+    title: '编辑人员',
+    uType: '1'
+  })
+}
+
+function switchTabletype() {
+  if (tableType.value == 0) {
+    tableType.value = 1
+  } else {
+    tableType.value = 0
+  }
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
+:deep(.el-checkbox__label) {
+  flex: 1 1 auto;
+}
+
+.flexBetweenBox {
+  width: 100%;
+  height: auto;
+  border-bottom: 1px solid #eee;
+  padding: 0 10px;
+}
+
+.flexBetweenBox:nth-child(odd) {
+  background: #FAFBFD;
+}
+
+.flexBetween {
+  padding: 10px;
+  border-left: 1px solid #eee;
+
+  .l {
+    div {
+      margin: 4px 0 0;
+      color: #999;
+    }
+  }
+}
+
 .app-container {
 .app-container {
   padding: 0;
   padding: 0;
   background: #F5F7F9;
   background: #F5F7F9;
@@ -295,6 +461,29 @@ function downloadVoucher() {
   color: #2ED981;
   color: #2ED981;
 }
 }
 
 
+.hasChoose {
+  margin: 0 0 20px;
+  display: flex;
+  justify-content: space-between;
+
+  button {
+    position: relative;
+    margin: 10px;
+  }
+
+  .choseItem {
+    margin: 10px;
+    position: relative;
+
+    .poClose {
+      position: absolute;
+      right: -6px;
+      top: -12px;
+      z-index: 1;
+    }
+  }
+}
+
 .chooseForm {
 .chooseForm {
   :deep(.el-form-item__content) {
   :deep(.el-form-item__content) {
     background: rgba(245, 247, 249, 0.38);
     background: rgba(245, 247, 249, 0.38);
@@ -303,6 +492,7 @@ function downloadVoucher() {
 
 
   .el-checkbox {
   .el-checkbox {
     height: auto;
     height: auto;
+    margin-right: 20px;
   }
   }
 
 
   :deep(.el-checkbox__input) {
   :deep(.el-checkbox__input) {
@@ -316,14 +506,66 @@ function downloadVoucher() {
   }
   }
 }
 }
 
 
-.td-flex {
-  display: flex;
-  align-items: center;
+:deep(.el-avatar) > img {
+  width: 100%;
+}
+
+.panel {
+  height: 100%;
+}
 
 
-  .info {
-    padding-left: 10px;
+.border-info {
+  .item {
+    margin: 5px 0;
+    color: #4C5359;
     font-size: 14px;
     font-size: 14px;
+
+    label {
+      font-size: 14px;
+      margin-right: 14px
+    }
   }
   }
 }
 }
 
 
+.ttbb {
+  font-size: 14px;
+  color: #4C5359;
+  display: flex;
+  justify-content: center;
+
+  div {
+    padding: 20px;
+    position: relative;
+    cursor: pointer;
+  }
+
+  div:first-child::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    background: #ccc;
+    width: 1px;
+    height: 14px;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+  }
+
+  .active {
+    color: var(--el-color-primary);
+
+    &::before {
+      width: 33px;
+      content: '';
+      position: absolute;
+      height: 2px;
+      bottom: 14px;
+      left: 0;
+      right: 0;
+      margin: auto;
+      background: #453DEA;
+      border-radius: 1px;
+    }
+  }
+}
 </style>
 </style>

@@ -72,9 +72,9 @@
                             clearable/>
                             clearable/>
                 </div>
                 </div>
               </div>
               </div>
-              <div class="panel-body" v-loading="loadingProject">
+              <div v-loading="loadingProject">
                 <el-checkbox-group v-model="projectIds">
                 <el-checkbox-group v-model="projectIds">
-                  <el-checkbox class="w100" v-for="c in projectList" :label="c.id" :key="c.id">
+                  <el-checkbox class="flexBetweenBox" v-for="c in projectList" :label="c.id" :key="c.id">
                     <div class="flexBetween w100">
                     <div class="flexBetween w100">
                       <div class="l">
                       <div class="l">
                         {{ c.code }}:{{ c.name }}
                         {{ c.code }}:{{ c.name }}
@@ -84,7 +84,7 @@
                     </div>
                     </div>
                   </el-checkbox>
                   </el-checkbox>
                 </el-checkbox-group>
                 </el-checkbox-group>
-                <el-empty v-if="projectList.length==0" image="@/assets/img/order_no.png" image-size="228"
+                <el-empty v-if="projectList.length==0" image="@/assets/img/order_no.png" :image-size="228"
                           :description="language==0?'无可选项目':''"/>
                           :description="language==0?'无可选项目':''"/>
               </div>
               </div>
             </div>
             </div>
@@ -102,119 +102,30 @@
       </el-card>
       </el-card>
 
 
       <el-card class="mt20" :body-style="{'padding': '0'}">
       <el-card class="mt20" :body-style="{'padding': '0'}">
-        <coach-info-row :names="names" :language="language"/>
+        <coach-info-row :match-id="matchId" :group-id="groupId" :language="language"/>
         <div class="m20">
         <div class="m20">
-
           <!--            <el-button type="success" @click="importSportman">批量导入人员</el-button>-->
           <!--            <el-button type="success" @click="importSportman">批量导入人员</el-button>-->
           <!--            <el-button type="success" @click="addCoach">新增运动员</el-button>-->
           <!--            <el-button type="success" @click="addCoach">新增运动员</el-button>-->
           <div class="ttbb">
           <div class="ttbb">
-            <div :class="tableType==1 ? 'active' : ''" @click="switchTabletype">{{ language == 0 ? '按组别查看报项' : 'View Entries by Group' }}</div>
-            <div :class="tableType==0 ? 'active' : ''" @click="switchTabletype">{{ language == 0 ? '按人员查看报项' : 'View Entries by Participant' }}</div>
+            <div :class="tableType==1 ? 'active' : ''" @click="switchTabletype">
+              {{ language == 0 ? '按组别查看报项' : 'View Entries by Group' }}
+            </div>
+            <div :class="tableType==0 ? 'active' : ''" @click="switchTabletype">
+              {{ language == 0 ? '按人员查看报项' : 'View Entries by Participant' }}
+            </div>
           </div>
           </div>
-<!--          <div class="fr mb20" @click="switchTabletype">-->
-<!--            <el-button plain type="primary" :icon="Switch" v-if="tableType==1">-->
-<!--              {{ language == 0 ? '按人员查看报项' : 'View Entries by Participant' }}-->
-<!--            </el-button>-->
-<!--            <el-button plain type="primary" :icon="Switch" v-else>-->
-<!--              {{ language == 0 ? '按组别查看报项' : 'View Entries by Group' }}-->
-<!--            </el-button>-->
-<!--          </div>-->
-          <el-table :data="signInfoTable" border style="width: 100%" v-if="tableType==0">
-            <el-table-column :label="language==0?'所属国家':'Nationality'" prop="personInfo.countryName" min-width="100"/>
-            <el-table-column :label="language==0?'姓氏':'Last Name'" prop="personInfo.xing" min-width="100"/>
-            <el-table-column :label="language==0?'名':'First Name'" prop="personInfo.ming" min-width="100"/>
-            <el-table-column :label="language==0?'短名':'Short Name'" prop="personInfo.shortName" min-width="110"/>
-            <el-table-column :label="language==0?'性别':'Gender'" prop="personInfo.sexStr"/>
-            <el-table-column :label="language==0?'年龄':'Age'" prop="personInfo.age"/>
-            <el-table-column :label="language==0?'出生日期':'Birth'" prop="personInfo.birth" width="110"/>
-            <el-table-column :label="language==0?'手机号码':'Phone Number'" prop="personInfo.phone" width="120"/>
-            <el-table-column :label="language==0?'邮箱':'E-mail'" prop="personInfo.email" width="150"/>
-            <el-table-column :label="language==0?'证件类型':'ID Type'" prop="personInfo.idcTypeStr"/>
-            <el-table-column :label="language==0?'证件号码':'ID NO.'" prop="personInfo.idcCode" width="200"/>
-            <el-table-column :label="language==0?'会员角色':'Role'" width="150">
-              <template #default="scope">
-                <div class="esp">
-          <span v-for="item in scope.row.personInfo.label?.split(',')" :key="item.id" class="text-primary">
-            <span v-if="item==='0'" class="ml5">{{ language==0?'运动员':'athletes' }}</span>
-            <span v-if="item==='1'" class="ml5">{{ language==0?'教练':'coach' }}</span>
-            <span v-if="item==='2'" class="ml5">{{ language==0?'领队':'team leader' }}</span>
-            <span v-if="item==='3'" class="ml5">{{ language==0?'队医':'team doctor' }}</span>
-            <span v-if="item==='4'" class="ml5">{{ language==0?'翻译':'translator' }}</span>
-            <span v-if="item==='5'" class="ml5">{{ language==0?'官员':'official' }}</span>
-            <span v-if="item==='6'" class="ml5">{{ language==0?'其他':'other' }}</span>
-          </span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="language==0?'详细地址':'Detailed Address'" prop="personInfo.address" min-width="140"/>
-
-            <el-table-column :label="language==0?'报项':'Entries'" width="300">
-              <template #default="props">
-                <ol>
-                  <li v-for="s in props.row.signInfo">
-                    {{ s.cptProjectName }}
-                    {{ s.cptGroupName }}{{ s.cptLevelName }}
-                    <span v-show="s.cptSonLevelName">[{{ s.cptSonLevelName }}]</span>
-                    <span v-show="s.zu">-{{ s.zu }}</span>
-<!--                    <el-button type="text" @click="editThis(s)">{{ language == 0 ? '修改' : 'Edit' }}</el-button>-->
-                    <!--                    <el-button type="text" @click="editMates(s)">更换队友</el-button>-->
-<!--                    <el-button type="text" @click="removeThis(s.id)">{{ language == 0 ? '删除' : 'Delete' }}</el-button>-->
-                  </li>
-                </ol>
-              </template>
-            </el-table-column>
-            <el-table-column :label="language==0?'保险费':'Premium'" prop="insuranceFee"/>
-            <!--            补充信息-->
-            <!--            <el-table-column v-for="(e,index) in extraTableHead" :key="index" :label="e">-->
-            <!--              <template #default="scope">-->
-            <!--                <el-link v-if="scope.row.signInfo[0].extraPersonInfoMapList[index]?.type=='2'" :herf="scope.row.signInfo[0].extraPersonInfoMapList[index].value.url">-->
-            <!--                  {{ scope.row.signInfo[0].extraPersonInfoMapList[index].value.name }}-->
-            <!--                </el-link>-->
-            <!--                <img v-else-if="scope.row.signInfo[0].extraPersonInfoMapList[index]?.type=='3'" style="width: 50px;" :src="scope.row.signInfo[0].extraPersonInfoMapList[index].value.url||scope.row.signInfo[0].extraPersonInfoMapList[index].value">-->
-            <!--                <span v-else>{{ scope.row.signInfo[0].extraPersonInfoMapList[index]?.value }}</span>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
-            <el-table-column :label="language==0?'操作':'Actions'" fixed="right" width="150" align="center">
-              <template #default="scope">
-                <el-button v-if="extraform&&extraform.length>0" type="text" @click="goPersonInfo(scope.row)">
-                  <span v-if="scope.row.extraPersonInfo">{{ language == 0 ? '修改' : 'Edit' }}</span>
-                  <span v-else class="red">完善补充信息</span>
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-
-          <el-table v-if="tableType==1" :data="zuTable" border style="width: 100%">
-            <el-table-column :label="language==0?'组别代码':'Group code'" width="120px" prop="zuName"/>
-            <el-table-column :label="language==0?'组别':'Group'" prop="project.name"/>
-            <el-table-column :label="language==0?'舞种':'Dance Style'" width="120px" prop="project.danceType"/>
-            <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" prop="project.remarks"/>
-            <el-table-column :label="language==0?'参赛运动员':'Participating athletes'" width="120px">
-              <template #default="scope">
-                <div>
-                  <span v-for="s in scope.row.athletes">{{ s.name }},</span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="language==0?'报名费':'Registration Fee'" width="120px" prop="">
-              <template #default="scope">
-                <div class="text-primary">
-                  ¥{{scope.row.project.serviceFee}}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="language==0?'操作':'Actions'" fixed="right" width="150" align="center">
-              <template #default="scope">
-                <!--                <el-button v-if="extraform&&extraform.length>0" type="text" @click="goPersonInfo(scope.row)">-->
-                <!--                  <span v-if="scope.row.extraPersonInfo">{{ language == 0 ? '修改' : 'Edit' }}</span>-->
-                <!--                  <span v-else class="red">-->
-                <!--                    {{language == 0 ? '完善补充信息' : 'Complete Supplementary Information'}}</span>-->
-                <!--                </el-button>-->
-                <el-button type="text" @click="removeThis(scope.row.id)">{{ language == 0 ? '删除' : 'Delete' }}</el-button>
-
-              </template>
-            </el-table-column>
-          </el-table>
+          <!--          <div class="fr mb20" @click="switchTabletype">-->
+          <!--            <el-button plain type="primary" :icon="Switch" v-if="tableType==1">-->
+          <!--              {{ language == 0 ? '按人员查看报项' : 'View Entries by Participant' }}-->
+          <!--            </el-button>-->
+          <!--            <el-button plain type="primary" :icon="Switch" v-else>-->
+          <!--              {{ language == 0 ? '按组别查看报项' : 'View Entries by Group' }}-->
+          <!--            </el-button>-->
+          <!--          </div>-->
+          <sign-info-table v-if="tableType==0" :match-id="matchId"
+                           :extraform="extraform" :language="language" :list="signInfoList"
+                           @editExtra="goPersonInfo"/>
+          <zu-table v-else :list="zuTableList" :language="language" @delete="removeThis"/>
           <div class="text-center mt20">
           <div class="text-center mt20">
             <el-button type="primary" class="w200px" plain round @click="goPrev()">
             <el-button type="primary" class="w200px" plain round @click="goPrev()">
               {{ language == 0 ? "上一步" : 'Go back' }}
               {{ language == 0 ? "上一步" : 'Go back' }}
@@ -270,22 +181,22 @@ const route = useRoute()
 import _ from 'lodash'
 import _ from 'lodash'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import cache from "@/plugins/cache"
 import cache from "@/plugins/cache"
-import TeamSignStep from "@/viewsPc/match/components/teamSignStep";
-import {getProjectPageByPerIds} from "@/apiPc/match";
-import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row";
-
+import TeamSignStep from "@/viewsPc/match/components/teamSignStep"
+import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row"
+import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
+import ZuTable from '@/viewsPc/match/components/zu-table'
 const language = ref(cache.local.get('language') || 0)
 const language = ref(cache.local.get('language') || 0)
 
 
 const data = reactive({
 const data = reactive({
   coachForm: {}, activeStep: 2,
   coachForm: {}, activeStep: 2,
   tableData: [],
   tableData: [],
-  signInfoTable: [],
-  zuTable: [],
+  signInfoList: [],
+  zuTableList: [],
   choosedList: [],
   choosedList: [],
   extraPersonInfoMapList: [],
   extraPersonInfoMapList: [],
   teamList: [],
   teamList: [],
   extraform: [],
   extraform: [],
-  groupId: '0',
+  groupId: route.query.groupId || 0,
   signType: '',
   signType: '',
   coachOrLeaderFlag: null,
   coachOrLeaderFlag: null,
   noPhotoCanSign: null,
   noPhotoCanSign: null,
@@ -301,40 +212,19 @@ const data = reactive({
   choosed2List: [], projectQuery: {}, tableType: 1
   choosed2List: [], projectQuery: {}, tableType: 1
 })
 })
 const {
 const {
-  activeTeam, names, tableData, signInfoTable, zuTable, choosedList, showExtraForm, extraPersonInfoMapList, teamList,
+  activeTeam, names, tableData, signInfoList, zuTableList, choosedList, showExtraForm, extraPersonInfoMapList, teamList,
   extraform, groupId, signType, coachOrLeaderFlag, showResult, noPhotoCanSign, extraTableHead,
   extraform, groupId, signType, coachOrLeaderFlag, showResult, noPhotoCanSign, extraTableHead,
   coachForm, projectIds, choosedchoosed, activeStep, projectList, choosed2List, loadingProject, projectQuery, tableType
   coachForm, projectIds, choosedchoosed, activeStep, projectList, choosed2List, loadingProject, projectQuery, tableType
 } = toRefs(data)
 } = toRefs(data)
-let matchId = ''
+const matchId = ref(route.query.matchId)
 let signInfoType = null
 let signInfoType = null
 onMounted(() => {
 onMounted(() => {
-  groupId.value = route.query.groupId
-  signType.value = route.query.signType
-  matchId = route.query.matchId
+  signType.value = route.query.signType || 1
   getSignInfoList()
   getSignInfoList()
-
-  if (signType.value == '0') {
-    geren()
-  } else {
-    tuandui()
-  }
-  getMatch(matchId)
-  getTableHead()
+  getMatch(matchId.value)
   getMySignInfo()
   getMySignInfo()
 })
 })
 
 
-function geren() {
-  match.getChooseDoneSingleCoachs(matchId).then(res => {
-    names.value = res.data
-  })
-}
-
-function tuandui() {
-  match.getChooseDoneGroupCoachs(matchId, groupId.value).then(res => {
-    names.value = res.data
-  })
-}
-
 let chargeFlag
 let chargeFlag
 
 
 function getMatch(id) {
 function getMatch(id) {
@@ -351,7 +241,7 @@ function getMatch(id) {
 function getMySignInfo() {
 function getMySignInfo() {
   // 获取已报
   // 获取已报
   match.getMySignInfo({
   match.getMySignInfo({
-    cptId: matchId,
+    cptId: matchId.value,
     groupId: groupId.value
     groupId: groupId.value
   }).then(res => {
   }).then(res => {
     tableData.value = res.data.signInfo
     tableData.value = res.data.signInfo
@@ -361,12 +251,11 @@ function getMySignInfo() {
 
 
 function getSignInfoList() {
 function getSignInfoList() {
   match.getMySignInfoList({
   match.getMySignInfoList({
-    cptId: matchId,
-    groupId: groupId.value,
-    teamId: activeTeam.value || ''
+    cptId: matchId.value,
+    groupId: groupId.value
   }).then(res => {
   }).then(res => {
-    signInfoTable.value = res.data.singleData
-    zuTable.value = res.data.zuData
+    signInfoList.value = res.data.singleData || []
+    zuTableList.value = res.data.zuData || []
     // if(signInfoTable.value.length>0){
     // if(signInfoTable.value.length>0){
     //   let choosedIds = []
     //   let choosedIds = []
     //   for(let p of choosedList.value){
     //   for(let p of choosedList.value){
@@ -382,12 +271,7 @@ function getSignInfoList() {
   })
   })
 }
 }
 
 
-function getTableHead() {
-  match.getCptExtraInfo(matchId).then(res => {
-    // console.log(res.data)
-    extraTableHead.value = res.data
-  })
-}
+
 
 
 function submitForm() {
 function submitForm() {
   if (signInfoType == '1') {
   if (signInfoType == '1') {
@@ -407,7 +291,7 @@ function submitForm() {
         needBuchong = true
         needBuchong = true
       }
       }
     }
     }
-    for (const s of signInfoTable.value) {
+    for (const s of signInfoList.value) {
       if (s.extraPersonInfo == null && needBuchong) {
       if (s.extraPersonInfo == null && needBuchong) {
         ElMessage.error('请完善运动员补充信息')
         ElMessage.error('请完善运动员补充信息')
         tableType.value = 0
         tableType.value = 0
@@ -416,7 +300,7 @@ function submitForm() {
     }
     }
   }
   }
   if (signInfoType == '2') {
   if (signInfoType == '2') {
-    match.recoverMySign({cptId: matchId, groupId: groupId.value}).then(res => {
+    match.recoverMySign({cptId: matchId.value, groupId: groupId.value}).then(res => {
       if (res.msg.indexOf('Exception:') > -1) {
       if (res.msg.indexOf('Exception:') > -1) {
         const msg = res.msg.slice(10)
         const msg = res.msg.slice(10)
         ElMessageBox.confirm(msg, '提示', {
         ElMessageBox.confirm(msg, '提示', {
@@ -437,14 +321,14 @@ function submitForm() {
   router.push({
   router.push({
     name: 'signPreview',
     name: 'signPreview',
     query: {
     query: {
-      matchId: matchId,
+      matchId: matchId.value,
       groupId: groupId.value
       groupId: groupId.value
     }
     }
   })
   })
 }
 }
 
 
 function afterRecover() {
 function afterRecover() {
-  if (signInfoTable.value.length == 0) {
+  if (signInfoList.value.length == 0) {
     if (language.value == 0) {
     if (language.value == 0) {
       ElMessage.error('请至少选择一个项目')
       ElMessage.error('请至少选择一个项目')
     } else {
     } else {
@@ -455,7 +339,7 @@ function afterRecover() {
   // 判断是否收费
   // 判断是否收费
   if (chargeFlag == '0') {
   if (chargeFlag == '0') {
     var obj = {
     var obj = {
-      cptId: matchId,
+      cptId: matchId.value,
       groupId: groupId.value
       groupId: groupId.value
     }
     }
     match.commitSign(obj).then(res => {
     match.commitSign(obj).then(res => {
@@ -467,7 +351,7 @@ function afterRecover() {
     router.push({
     router.push({
       name: 'expenseDetails',
       name: 'expenseDetails',
       query: {
       query: {
-        matchId: matchId,
+        matchId: matchId.value,
         groupId: groupId.value
         groupId: groupId.value
       }
       }
     })
     })
@@ -481,7 +365,7 @@ function goPrev() {
 function chooseSportman() {
 function chooseSportman() {
   if (signInfoType == '2') {
   if (signInfoType == '2') {
     match.recoverMySign({
     match.recoverMySign({
-      cptId: matchId,
+      cptId: matchId.value,
       groupId: groupId.value
       groupId: groupId.value
     }).then(res => {
     }).then(res => {
       if (res.msg.indexOf('Exception:') > -1) {
       if (res.msg.indexOf('Exception:') > -1) {
@@ -501,7 +385,7 @@ function chooseSportman() {
 
 
   const params = {
   const params = {
     title: language.value == 0 ? '选择运动员' : 'Participating athletes',
     title: language.value == 0 ? '选择运动员' : 'Participating athletes',
-    matchId: matchId,
+    matchId: matchId.value,
     groupId: groupId.value,
     groupId: groupId.value,
     rankId: activeTeam.value,
     rankId: activeTeam.value,
     signType: signType.value,
     signType: signType.value,
@@ -534,7 +418,7 @@ function getProjectList() {
   loadingProject.value = true
   loadingProject.value = true
   //根据已选人员id 获取项目列表
   //根据已选人员id 获取项目列表
   var obj = {
   var obj = {
-    cptId: matchId,
+    cptId: matchId.value,
     perIds: choosedchoosed.value.toString()
     perIds: choosedchoosed.value.toString()
   }
   }
   match.getProjectPageByPerIds(obj).then(res => {
   match.getProjectPageByPerIds(obj).then(res => {
@@ -555,7 +439,7 @@ function getChoosed(list) {
 function addCoach() {
 function addCoach() {
   if (signInfoType == '2') {
   if (signInfoType == '2') {
     match.recoverMySign({
     match.recoverMySign({
-      cptId: matchId,
+      cptId: matchId.value,
       groupId: groupId.value
       groupId: groupId.value
     }).then(res => {
     }).then(res => {
       if (res.msg.indexOf('Exception:') > -1) {
       if (res.msg.indexOf('Exception:') > -1) {
@@ -580,20 +464,6 @@ function addCoach() {
   proxy.$refs['dialogAddCoachRef'].open(params)
   proxy.$refs['dialogAddCoachRef'].open(params)
 }
 }
 
 
-function signForThisMan(p) {
-  const params = {
-    title: '选择报项',
-    matchId: matchId,
-    groupId: groupId.value,
-    rankId: activeTeam.value,
-    signType: signType.value,
-    noPhotoCanSign: noPhotoCanSign.value,
-    coachOrLeaderFlag: coachOrLeaderFlag.value,
-    personal: p,
-    choosedList: choosedList.value
-  }
-  proxy.$refs['dialogSportsmanListRef'].open(params)
-}
 
 
 function delthischoosed(p) {
 function delthischoosed(p) {
   choosedList.value = _.without(choosedList.value, p)
   choosedList.value = _.without(choosedList.value, p)
@@ -617,7 +487,7 @@ function editThis(row) {
   const params = {
   const params = {
     title: '修改报项',
     title: '修改报项',
     personal: row.cptPersonInfo,
     personal: row.cptPersonInfo,
-    matchId: matchId,
+    matchId: matchId.value,
     groupId: groupId.value,
     groupId: groupId.value,
     rankId: activeTeam.value,
     rankId: activeTeam.value,
     signType: signType.value,
     signType: signType.value,
@@ -644,8 +514,8 @@ function signUp() {
     groupId: groupId.value
     groupId: groupId.value
   }
   }
   match.sportsmanDone(obj).then(res => {
   match.sportsmanDone(obj).then(res => {
-
     getSignInfoList()
     getSignInfoList()
+    getProjectList()
   })
   })
 }
 }
 
 
@@ -712,7 +582,7 @@ const goPersonInfo = (row) => {
 function downloadVoucher() {
 function downloadVoucher() {
   // 下载凭证
   // 下载凭证
   proxy.download(
   proxy.download(
-      `/pdf/getPayedOrderPdf/${matchId}/${groupId.value || 0}`, {}, '报项凭证.pdf'
+      `/pdf/getPayedOrderPdf/${matchId.value}/${groupId.value || 0}`, {}, '报项凭证.pdf'
   )
   )
 }
 }
 
 
@@ -738,7 +608,21 @@ function switchTabletype() {
   flex: 1 1 auto;
   flex: 1 1 auto;
 }
 }
 
 
+.flexBetweenBox {
+  width: 100%;
+  height: auto;
+  border-bottom: 1px solid #eee;
+  padding: 0 10px;
+}
+
+.flexBetweenBox:nth-child(odd) {
+  background: #FAFBFD;
+}
+
 .flexBetween {
 .flexBetween {
+  padding: 10px;
+  border-left: 1px solid #eee;
+
   .l {
   .l {
     div {
     div {
       margin: 4px 0 0;
       margin: 4px 0 0;
@@ -795,7 +679,8 @@ function switchTabletype() {
   }
   }
 
 
   .el-checkbox {
   .el-checkbox {
-    height: auto;margin-right: 20px;
+    height: auto;
+    margin-right: 20px;
   }
   }
 
 
   :deep(.el-checkbox__input) {
   :deep(.el-checkbox__input) {
@@ -829,18 +714,46 @@ function switchTabletype() {
     }
     }
   }
   }
 }
 }
-.ttbb{font-size: 14px;
+
+.ttbb {
+  font-size: 14px;
   color: #4C5359;
   color: #4C5359;
-  display: flex;justify-content: center;
-  div{padding: 20px;position: relative;cursor: pointer;}
-  div:first-child::after {content: '';position: absolute;right: 0;
-    background: #ccc;width: 1px;height: 14px;top:0;bottom: 0;margin: auto;}
-
-  .active{color: var(--el-color-primary);
-    &::before{width: 33px;content: '';position: absolute;
-      height: 2px;bottom: 14px;left: 0;right: 0;margin: auto;
+  display: flex;
+  justify-content: center;
+
+  div {
+    padding: 20px;
+    position: relative;
+    cursor: pointer;
+  }
+
+  div:first-child::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    background: #ccc;
+    width: 1px;
+    height: 14px;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+  }
+
+  .active {
+    color: var(--el-color-primary);
+
+    &::before {
+      width: 33px;
+      content: '';
+      position: absolute;
+      height: 2px;
+      bottom: 14px;
+      left: 0;
+      right: 0;
+      margin: auto;
       background: #453DEA;
       background: #453DEA;
-      border-radius: 1px;}
+      border-radius: 1px;
+    }
   }
   }
 }
 }
 </style>
 </style>

@@ -46,8 +46,8 @@
                   <el-table-column v-if="coachOrLeaderFlag=='1'" label="领队" prop="leaderNames" />
                   <el-table-column v-if="coachOrLeaderFlag=='1'" label="领队" prop="leaderNames" />
                   <el-table-column label="操作" fixed="right" width="100" align="center">
                   <el-table-column label="操作" fixed="right" width="100" align="center">
                     <template #default="scope">
                     <template #default="scope">
-                      <el-button type="text" @click="editThis(scope.row)">编辑</el-button>
-                      <el-button type="text" @click="removeThis(scope.row.id)">删除</el-button>
+                      <el-button  type="primary" link @click="editThis(scope.row)">编辑</el-button>
+                      <el-button  type="primary" link @click="removeThis(scope.row.id)">删除</el-button>
                     </template>
                     </template>
                   </el-table-column>
                   </el-table-column>
                 </el-table>
                 </el-table>

+<template>
+  <div>
+    <div class="box ph-30">
+      <el-card>
+        <single-sign-step v-if="user.utype=='1'" activeStep="3" :language="language"/>
+        <team-sign-step v-if="user.utype=='2'" activeStep="4" :language="language"/>
+      </el-card>
+      <el-card class="mt20">
+        <div class="flexCenter pd20">
+          <img src="@/assets/img/e.png"/>
+          <div>
+            <div>账号：{{ user.userName }}</div>
+            <h3>报名信息提交成功</h3>
+          </div>
+        </div>
+        <div class="text-center  flexCenter">
+          <div class="border-info mt20">
+            审核结果，后续将以邮件形式正式通知您。
+            <br/>
+            邮件发送账号：<span class="text-primary">{{ user.email }}</span>
+            ，请关注相关邮件通知。
+            <br/>
+            如果您的报名信息审核通过，邮件正文会附上相关费用的支付链接，请通过链接完成支付，完成报名。
+          </div>
+        </div>
+
+        <div class="text-center mt30 mb20">
+          <el-button class="primary-kx w200px" round @click="goHome">{{ language == 0 ? '返回首页' : 'Homepage' }}</el-button>
+          <el-button type="primary" class="btn-lineG w200px" round @click="goSign">{{ language == 0 ? '返回赛事报名模块' : 'Sign Up' }}</el-button>
+        </div>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import TeamSignStep from './components/teamSignStep'
+import SingleSignStep from './components/singleSignStep'
+const router = useRouter()
+import useUserStore from "@/store/modules/user"
+import {ref} from "vue"
+import cache from "@/plugins/cache"
+import {useRouter} from "vue-router";
+
+const language = ref(cache.local.get('language') || 0)
+const user = useUserStore().user
+
+const goHome = () => {
+  router.push({
+    name: `home`
+  })
+}
+const goSign = () => {
+  router.push({
+    name: `matchDetail`,
+    params:{id:0}
+  })
+}
+</script>
+
+<style scoped lang="scss">
+.border-info{padding: 30px;line-height: 2;}
+</style>

@@ -7,7 +7,7 @@
     <el-form ref="dialogRef" :model="form" :rules="rules" label-width="120px" inline>
     <el-form ref="dialogRef" :model="form" :rules="rules" label-width="120px" inline>
       <el-row :gutter="30">
       <el-row :gutter="30">
         <el-col :lg="12" class="touxiang">
         <el-col :lg="12" class="touxiang">
-          <el-form-item prop="picUrl" label="个人照片" required>
+          <el-form-item prop="picUrl" :label="language==0?'个人照片':'photo'" required>
             <ImageUpload2
             <ImageUpload2
                 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
                 v-model="form.picUrl" :crop-height="280" :crop-width="200" class="threeFour" :limit="1"
                 :is-show-tip="false"
                 :is-show-tip="false"
@@ -65,7 +65,7 @@
               <el-radio label="1">{{ language==0?'男':'male' }}</el-radio>
               <el-radio label="1">{{ language==0?'男':'male' }}</el-radio>
             </el-radio-group>
             </el-radio-group>
           </el-form-item>
           </el-form-item>
-          <el-form-item :label="language==0?'邮箱':'Email'" prop="idcCode" required>
+          <el-form-item :label="language==0?'邮箱':'Email'" prop="email" required>
             <el-input v-model="form.email"/>
             <el-input v-model="form.email"/>
           </el-form-item>
           </el-form-item>
           <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required>
           <el-form-item :label="language==0?'证件号码':'ID NO'" prop="idcCode" required>
@@ -134,9 +134,10 @@ const data = reactive({
   ],
   ],
   title: '添加选手信息',
   title: '添加选手信息',
   groupId: '0',
   groupId: '0',
-  showRequire: false
+  showRequire: false,
+  uType:''
 })
 })
-const {showRequire, form, rules, show, countryList, regionsList, title, groupId, labels} = toRefs(data)
+const {showRequire, form, rules, show, countryList, regionsList, title, groupId, labels,uType} = toRefs(data)
 onMounted(() => {
 onMounted(() => {
   getCountryList()
   getCountryList()
   getRegionsList()
   getRegionsList()
@@ -147,17 +148,31 @@ const open = (params) => {
   show.value = true
   show.value = true
   title.value = params.title
   title.value = params.title
   groupId.value = params.groupId || '0'
   groupId.value = params.groupId || '0'
-  if (params.id != 0) { // 编辑
-    editgay = true
-    match.getPersonInfoById(params.id).then(res => {
+  uType.value = params.uType
+  if(uType.value == '1'){
+    //个人
+    match.getMyPersonInfo().then(res => {
       form.value = res.data
       form.value = res.data
-      form.value.id = params.id
+      form.value.id = res.data.id
       if (form.value.label) {
       if (form.value.label) {
         // {0:0,1:1,2:3}
         // {0:0,1:1,2:3}
         form.value.labelArr = form.value.label.split(',')
         form.value.labelArr = form.value.label.split(',')
         labelvalue(form.value.labelArr)
         labelvalue(form.value.labelArr)
       }
       }
     })
     })
+  } else {
+    if (params.id != 0) { // 编辑
+      editgay = true
+      match.getPersonInfoById(params.id).then(res => {
+        form.value = res.data
+        form.value.id = params.id
+        if (form.value.label) {
+          // {0:0,1:1,2:3}
+          form.value.labelArr = form.value.label.split(',')
+          labelvalue(form.value.labelArr)
+        }
+      })
+    }
   }
   }
 }
 }
 defineExpose({open})
 defineExpose({open})
@@ -286,11 +301,20 @@ function submitForm() {
             emit('submitForm')
             emit('submitForm')
           })
           })
         } else {
         } else {
-          match.savePersonForMyPerson(form.value).then(res => {
-            ElMessage.success('保存成功')
-            show.value = false
-            emit('submitForm')
-          })
+          // if(uType.value == '1'){
+          //   match.saveMyBaseInfo(form.value).then(res => {
+          //     ElMessage.success('保存成功')
+          //     show.value = false
+          //     emit('submitForm')
+          //   })
+          // } else {
+            match.savePersonForMyPerson(form.value).then(res => {
+              ElMessage.success('保存成功')
+              show.value = false
+              emit('submitForm')
+            })
+          // }
+
         }
         }
       }
       }
     }
     }

@@ -71,7 +71,7 @@
       <el-table-column :label="language==0?'详细地址':'Detailed Address'" prop="address" min-width="140"/>
       <el-table-column :label="language==0?'详细地址':'Detailed Address'" prop="address" min-width="140"/>
       <el-table-column :label="language==0?'操作':'Actions'" width="120" fixed="right" align="center">
       <el-table-column :label="language==0?'操作':'Actions'" width="120" fixed="right" align="center">
         <template #default="scope">
         <template #default="scope">
-          <el-button type="text" @click="editPerson(scope.row)">
+          <el-button link type="primary" @click="editPerson(scope.row)">
             {{language==0?'编辑':'Edit'}}
             {{language==0?'编辑':'Edit'}}
           </el-button>
           </el-button>
         </template>
         </template>
@@ -103,7 +103,9 @@ const language = ref(cache.local.get('language') || 0)
 const {proxy} = getCurrentInstance()
 const {proxy} = getCurrentInstance()
 const emit = defineEmits(['submitForm', 'transfer'])
 const emit = defineEmits(['submitForm', 'transfer'])
 const data = reactive({
 const data = reactive({
-  query: {},
+  query: {
+    label:'0'
+  },
   tableData: [],
   tableData: [],
   birthArr: [],
   birthArr: [],
   show: false,
   show: false,
@@ -184,7 +186,7 @@ function addMember() {
   const params = {
   const params = {
     title: '添加人员',
     title: '添加人员',
     id: 0,
     id: 0,
-    groupId: groupId.value
+    groupId: groupId
   }
   }
   proxy.$refs['dialogAddCoach'].open(params)
   proxy.$refs['dialogAddCoach'].open(params)
 }
 }
@@ -192,7 +194,7 @@ function addMember() {
 function importSportman() {
 function importSportman() {
   const params = {
   const params = {
     title: '批量导入选手',
     title: '批量导入选手',
-    groupId: groupId.value
+    groupId: groupId
   }
   }
   proxy.$refs['dialogImportProps'].open(params)
   proxy.$refs['dialogImportProps'].open(params)
 }
 }

 <template>
 <template>
-  <div class="border-info"  style="margin: 20px">
+  <div class="border-info" style="margin: 20px" v-loading="loading">
     <el-row>
     <el-row>
       <el-col :lg="8">
       <el-col :lg="8">
         <div class="item"><label>{{ language == 0 ? '教练' : 'Coach' }}</label>
         <div class="item"><label>{{ language == 0 ? '教练' : 'Coach' }}</label>
           <span v-for="c in names.coachList">{{ c.shortName }}</span>
           <span v-for="c in names.coachList">{{ c.shortName }}</span>
+          <span v-if="!names.coachList">--</span>
         </div>
         </div>
         <div class="item"><label>{{ language == 0 ? '翻译' : 'Translator' }}</label>
         <div class="item"><label>{{ language == 0 ? '翻译' : 'Translator' }}</label>
           <span v-for="c in names.translatorList">{{ c.shortName }}</span>
           <span v-for="c in names.translatorList">{{ c.shortName }}</span>
+          <span v-if="!names.translatorList">--</span>
         </div>
         </div>
       </el-col>
       </el-col>
       <el-col :lg="8">
       <el-col :lg="8">
         <div class="item">
         <div class="item">
           <label>{{ language == 0 ? '领队' : 'Team leader' }}</label>
           <label>{{ language == 0 ? '领队' : 'Team leader' }}</label>
           <span v-for="c in names.leaderList">{{ c.shortName }}</span>
           <span v-for="c in names.leaderList">{{ c.shortName }}</span>
+          <span v-if="!names.leaderList">--</span>
         </div>
         </div>
         <div class="item">
         <div class="item">
           <label>{{ language == 0 ? '官员' : 'Official' }}</label>
           <label>{{ language == 0 ? '官员' : 'Official' }}</label>
@@ -26,12 +29,14 @@
           <span class="mr5" v-for="c in names.teamDoctorList">
           <span class="mr5" v-for="c in names.teamDoctorList">
             {{ c.shortName }}
             {{ c.shortName }}
           </span>
           </span>
+          <span v-if="!names.teamDoctorList">--</span>
         </div>
         </div>
         <div class="item">
         <div class="item">
           <label>{{ language == 0 ? '其他' : 'Other' }}</label>
           <label>{{ language == 0 ? '其他' : 'Other' }}</label>
           <span class="mr5" v-for="c in names.otherList">
           <span class="mr5" v-for="c in names.otherList">
             {{ c.shortName }}
             {{ c.shortName }}
           </span>
           </span>
+          <span v-if="!names.otherList">--</span>
         </div>
         </div>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
@@ -39,17 +44,44 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+import * as match from "@/apiPc/match";
+import {onMounted} from "@vue/runtime-core";
+import useUserStore from "@/store/modules/user";
+
 const props = defineProps({
 const props = defineProps({
-  names: {
-    type: Object,
+  matchId: {
+    type: String,
     required: true
     required: true
-  },
-  language: {
-    type: Number,
-    required: true,
-    default: 0
   }
   }
 })
 })
+const names = ref({})
+const loading = ref(true)
+import cache from "@/plugins/cache"
+const user = useUserStore().user
+const group = useUserStore().group || {}
+const language = ref(cache.local.get('language') || 0)
+onMounted(() => {
+  if (user.utype == '2') {
+    tuandui()
+  }
+  if(user.utype == '1'){
+    geren()
+  }
+})
+
+function geren() {
+  match.getChooseDoneSingleCoachs(props.matchId).then(res => {
+    names.value = res.data
+    loading.value = false
+  })
+}
+
+function tuandui() {
+  match.getChooseDoneGroupCoachs(props.matchId, group.id).then(res => {
+    names.value = res.data
+    loading.value = false
+  })
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -4,17 +4,20 @@
     destroy-on-close
     destroy-on-close
   >
   >
     <el-descriptions border>
     <el-descriptions border>
-      <el-descriptions-item v-if="form.picUrl" label="照片">
-        <img style="width: 100px" :src="form.picUrl">
+      <el-descriptions-item v-if="form.picUrl" :label="language==0?'个人照片':'photo'">
+        <img style="width: 60px" :src="fillImgUrl(form.picUrl)">
       </el-descriptions-item>
       </el-descriptions-item>
-      <el-descriptions-item label="姓名">{{ form.realName }}</el-descriptions-item>
-      <el-descriptions-item label="性别">{{ form.sexStr }}</el-descriptions-item>
-      <el-descriptions-item label="证件类型">{{ form.idcTypeStr }}</el-descriptions-item>
-      <el-descriptions-item label="证件号码">{{ form.idcCode }}</el-descriptions-item>
-      <el-descriptions-item label="出生日期">{{ form.birth }}</el-descriptions-item>
-      <el-descriptions-item label="联系方式">{{ form.phone }}</el-descriptions-item>
-      <el-descriptions-item label="国籍">{{ form.countryName }}</el-descriptions-item>
-      <el-descriptions-item label="民族">{{ form.nation }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'姓氏':'surname'">{{ form.xing }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'名':'name'">{{ form.ming }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'短名':'short name'">{{ form.shortName }}</el-descriptions-item>
+      <el-descriptions-item  :label="language==0?'性别':'sex'">{{ form.sexStr }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'所属国家':'Nationality'">{{ form.countryName }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'证件类型':'ID type'">{{ form.idcTypeStr }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'证件号码':'ID NO'">{{ form.idcCode }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'出生日期':'birth'">{{ form.birth }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'手机号码':'Phone'">{{ form.phone }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'邮箱':'Email'">{{ form.email }}</el-descriptions-item>
+      <el-descriptions-item :label="language==0?'详细地址':'Address'">{{ form.address }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
 
 
     <el-row v-if="participantsInfoArr&&participantsInfoArr.length>0" class="mt20">
     <el-row v-if="participantsInfoArr&&participantsInfoArr.length>0" class="mt20">
@@ -62,6 +65,9 @@ const { proxy } = getCurrentInstance()
 const emit = defineEmits(['submitForm'])
 const emit = defineEmits(['submitForm'])
 const uploadUrl = ref('/upload/upLoadToFileServer')
 const uploadUrl = ref('/upload/upLoadToFileServer')
 const route = useRoute()
 const route = useRoute()
+import cache from "@/plugins/cache"
+const language = ref(cache.local.get('language') || 0)
+
 const data = reactive({
 const data = reactive({
   form: {},
   form: {},
   show: false,
   show: false,

@@ -26,17 +26,28 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+import useUserStore from "@/store/modules/user";
+import cache from "@/plugins/cache";
+import {getGroup} from "@/api/match/CompetitionProject";
+import * as match from "@/apiPc/match";
+
+const language = ref(cache.local.get('language') || 0)
 const props = defineProps({
 const props = defineProps({
-  groupInfo: {
+  groupId: {
     type: Object,
     type: Object,
     required: true
     required: true
-  },
-  language: {
-    type: Number,
-    required: true,
-    default: 0
   }
   }
 })
 })
+const user = useUserStore().user
+const groupInfo = useUserStore().group
+if(props.groupId!=0){
+  getGroupInfo()
+}
+function getGroupInfo() {
+  match.getGroupInfo().then(res => {
+    groupInfo.value = res.data
+  })
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -2,11 +2,12 @@
   <el-dialog v-model="show" :title="title" width="500px"  close-icon="CircleClose"
   <el-dialog v-model="show" :title="title" width="500px"  close-icon="CircleClose"
              append-to-body :close-on-click-modal="false"   class="pcloginpop" center>
              append-to-body :close-on-click-modal="false"   class="pcloginpop" center>
     <el-form ref="dialogRef" label-width="100px">
     <el-form ref="dialogRef" label-width="100px">
-      <el-form-item label="下载模板">
-        <el-link href="/file/sportsmanTemplate.xlsx" type="primary" target="_blank">人员模板</el-link>
+      <el-form-item :label="language==0?'下载模板':'Download template'">
+        <el-link href="/file/UserImport-ch.xlsx" v-if="language==0" type="primary" target="_blank">人员模板</el-link>
+        <el-link href="/file/UserImport-en.xlsx" v-else type="primary" target="_blank">Personnel template</el-link>
       </el-form-item>
       </el-form-item>
 
 
-      <el-form-item label="上传模板" prop="discount">
+      <el-form-item :label="language==0?'上传模板':'Upload template'" prop="discount">
         <fileImport ref="upload" name="excel" :action="action"  @uploadSuccess="uploadSuccess" />
         <fileImport ref="upload" name="excel" :action="action"  @uploadSuccess="uploadSuccess" />
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
@@ -25,13 +26,17 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
 import useUserStore from '@/store/modules/user'
 import useUserStore from '@/store/modules/user'
 const emit = defineEmits(['submitForm'])
 const emit = defineEmits(['submitForm'])
-
+import cache from "@/plugins/cache"
+const language = ref(cache.local.get('language') || 0)
 const action = ref('')
 const action = ref('')
 const accept = ref('.xlsx')
 const accept = ref('.xlsx')
 const title = ref('')
 const title = ref('')
 const show = ref(false)
 const show = ref(false)
 const userStore = useUserStore()
 const userStore = useUserStore()
-const groupId = useUserStore().group.id || 0
+let groupId = 0
+if(useUserStore().group){
+  groupId = useUserStore().group.id
+}
 function uploadSuccess(res) {
 function uploadSuccess(res) {
   console.log(res)
   console.log(res)
   cancel()
   cancel()

@@ -78,7 +78,7 @@
           </el-row>
           </el-row>
           <el-row>
           <el-row>
             <el-col :span="2" :offset="22">
             <el-col :span="2" :offset="22">
-              <el-button type="text" class="fr" @click="editRank(r)">编辑</el-button>
+              <el-button  type="primary" link class="fr" @click="editRank(r)">编辑</el-button>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
         </div>
         </div>

 <template>
 <template>
-  <div class="border-info" style="margin: 20px">
+  <div class="border-info" style="margin: 20px" v-loading="loading">
     <el-row v-if="language==0">
     <el-row v-if="language==0">
       <el-col :lg="8"><div class="item"><label>赛事名称</label>{{matchInfo.name}}</div></el-col>
       <el-col :lg="8"><div class="item"><label>赛事名称</label>{{matchInfo.name}}</div></el-col>
       <el-col :lg="8"><div class="item"><label>赛事类型</label>{{matchInfo.name}}</div></el-col>
       <el-col :lg="8"><div class="item"><label>赛事类型</label>{{matchInfo.name}}</div></el-col>
@@ -18,17 +18,30 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+import {onMounted} from "@vue/runtime-core";
+import * as match from "@/apiPc/match";
+import cache from "@/plugins/cache";
+
+const language = ref(cache.local.get('language') || 0)
 const props = defineProps({
 const props = defineProps({
-  matchInfo: {
-    type: Object,
+  matchId: {
+    type: String,
     required: true
     required: true
-  },
-  language: {
-    type: Number,
-    required: true,
-    default: 0
   }
   }
 })
 })
+const matchInfo = ref({})
+const loading = ref(false)
+onMounted(()=>{
+  loading.value = true
+  if(props.matchId)
+  getMatch()
+})
+const getMatch = () => {
+  match.getMatchById({ id: props.matchId }).then(res => {
+    matchInfo.value = res.data
+    loading.value = false
+  })
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -98,7 +98,7 @@
           </div>
           </div>
         </el-collapse-item>
         </el-collapse-item>
       </el-collapse>
       </el-collapse>
-      <el-empty image="@/assets/img/order_no.png" image-size="228"  v-if="form.cptProjectList?.length == 0" description=" "/>
+      <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="form.cptProjectList?.length == 0" description=" "/>
     </div>
     </div>
   </div>
   </div>
   <div style="padding: 0 20px 20px" v-else>
   <div style="padding: 0 20px 20px" v-else>
@@ -200,7 +200,7 @@
           </div>
           </div>
         </el-collapse-item>
         </el-collapse-item>
       </el-collapse>
       </el-collapse>
-      <el-empty image="@/assets/img/order_no.png" image-size="228"  v-if="form.cptProjectList?.length == 0" description=" "/>
+      <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="form.cptProjectList?.length == 0" description=" "/>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

@@ -24,7 +24,7 @@
       </el-timeline-item>
       </el-timeline-item>
     </el-timeline>
     </el-timeline>
 
 
-    <el-empty  image="@/assets/img/order_no.png" image-size="228" v-if="matchData.cptScheduleList?.length==0" description="" />
+    <el-empty  image="@/assets/img/order_no.png" :image-size="228" v-if="matchData.cptScheduleList?.length==0" description="" />
 
 
   </div>
   </div>
 </template>
 </template>

@@ -16,7 +16,7 @@
                 </el-radio>
                 </el-radio>
               </div>
               </div>
             </el-radio-group>
             </el-radio-group>
-            <el-empty v-if="projectList.length==0" image="@/assets/img/order_no.png" image-size="228"  description="无可选项目" />
+            <el-empty v-if="projectList.length==0" image="@/assets/img/order_no.png" :image-size="228"  description="无可选项目" />
 
 
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>

+<template>
+  <el-table :data="list" border style="width: 100%" v-loading="loading">
+    <el-table-column :label="language==0?'所属国家':'Nationality'" prop="personInfo.countryName" min-width="100"/>
+    <el-table-column :label="language==0?'姓氏':'Last Name'" prop="personInfo.xing" min-width="100"/>
+    <el-table-column :label="language==0?'名':'First Name'" prop="personInfo.ming" min-width="100"/>
+    <el-table-column :label="language==0?'短名':'Short Name'" prop="personInfo.shortName" min-width="110"/>
+    <el-table-column :label="language==0?'性别':'Gender'" prop="personInfo.sexStr"/>
+    <el-table-column :label="language==0?'年龄':'Age'" prop="personInfo.age"/>
+    <el-table-column :label="language==0?'出生日期':'Birth'" prop="personInfo.birth" width="110"/>
+    <el-table-column :label="language==0?'手机号码':'Phone Number'" prop="personInfo.phone" width="120"/>
+    <el-table-column :label="language==0?'邮箱':'E-mail'" prop="personInfo.email" width="150"/>
+    <el-table-column :label="language==0?'证件类型':'ID Type'" prop="personInfo.idcTypeStr"/>
+    <el-table-column :label="language==0?'证件号码':'ID NO.'" prop="personInfo.idcCode" width="200"/>
+    <el-table-column :label="language==0?'会员角色':'Role'" width="150">
+      <template #default="scope">
+        <div class="esp">
+          <span v-for="item in scope.row.personInfo.label?.split(',')" :key="item.id" class="text-primary">
+            <span v-if="item==='0'" class="ml5">{{ language == 0 ? '运动员' : 'athletes' }}</span>
+            <span v-if="item==='1'" class="ml5">{{ language == 0 ? '教练' : 'coach' }}</span>
+            <span v-if="item==='2'" class="ml5">{{ language == 0 ? '领队' : 'team leader' }}</span>
+            <span v-if="item==='3'" class="ml5">{{ language == 0 ? '队医' : 'team doctor' }}</span>
+            <span v-if="item==='4'" class="ml5">{{ language == 0 ? '翻译' : 'translator' }}</span>
+            <span v-if="item==='5'" class="ml5">{{ language == 0 ? '官员' : 'official' }}</span>
+            <span v-if="item==='6'" class="ml5">{{ language == 0 ? '其他' : 'other' }}</span>
+          </span>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column :label="language==0?'详细地址':'Detailed Address'" prop="personInfo.address" min-width="140"/>
+
+    <el-table-column :label="language==0?'报项':'Entries'" min-width="300" :fixed="hasAction?false:'right'">
+      <template #default="props">
+        <ol>
+          <li v-for="s in props.row.signInfo">
+            {{ s.cptProjectName }}
+            {{ s.cptGroupName }}{{ s.cptLevelName }}
+            <span v-show="s.cptSonLevelName">[{{ s.cptSonLevelName }}]</span>
+            <span v-show="s.zu">-{{ s.zu }}</span>
+            <!--                    <el-button type="text" @click="editThis(s)">{{ language == 0 ? '修改' : 'Edit' }}</el-button>-->
+            <!--                    <el-button type="text" @click="editMates(s)">更换队友</el-button>-->
+            <!--                    <el-button type="text" @click="removeThis(s.id)">{{ language == 0 ? '删除' : 'Delete' }}</el-button>-->
+          </li>
+        </ol>
+      </template>
+    </el-table-column>
+    <el-table-column :fixed="hasAction?false:'right'" :label="language==0?'保险费':'Premium'" prop="insuranceFee">
+      <template #default="scope">
+        <span class="text-primary">¥{{ scope.row.insuranceFee }}</span>
+      </template>
+    </el-table-column>
+    <!--                补充信息-->
+    <el-table-column v-for="(e,index) in extraTableHead" :key="index" :label="e" min-width="110" align="center">
+      <template #default="scope">
+        <el-link v-if="scope.row.signInfo[0].extraPersonInfoMapList[index]?.type=='2'"
+                 :herf="scope.row.signInfo[0].extraPersonInfoMapList[index].value.url">
+          {{ scope.row.signInfo[0].extraPersonInfoMapList[index].value.name }}
+        </el-link>
+        <img v-else-if="scope.row.signInfo[0].extraPersonInfoMapList[index]?.type=='3'" style="width: 50px;"
+             :src="scope.row.signInfo[0].extraPersonInfoMapList[index].value.url||scope.row.signInfo[0].extraPersonInfoMapList[index].value">
+        <span v-else>{{ scope.row.signInfo[0].extraPersonInfoMapList[index]?.value }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column v-if="hasAction" :label="language==0?'操作':'Actions'" fixed="right" width="150" align="center">
+      <template #default="scope">
+        <el-button v-if="extraform&&extraform.length>0"  type="primary" link @click="goPersonInfo(scope.row)">
+          <span v-if="scope.row.extraPersonInfo">{{ language == 0 ? '修改' : 'Edit' }}</span>
+          <span v-else class="red">{{ language == 0?'完善补充信息':'Additional Information' }}</span>
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+
+</template>
+
+<script setup>
+import * as match from "@/apiPc/match";
+import {onMounted} from "@vue/runtime-core";
+import {watch} from "vue";
+
+const emit = defineEmits(['editExtra'])
+const props = defineProps({
+  matchId: {
+    type: String,
+    required: true
+  },
+  list: {
+    type: Array,
+    required: true
+  },
+  extraform: {
+    type: Object,
+    required: false
+  },
+  hasAction: {
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+import cache from "@/plugins/cache";
+const language = ref(cache.local.get('language') || 0)
+const extraTableHead = ref([])
+const loading = ref(true)
+getTableHead()
+const goPersonInfo = (row) => {
+  emit('editExtra', row)
+}
+function getTableHead() {
+  match.getCptExtraInfo(props.matchId).then(res => {
+    extraTableHead.value = res.data
+    loading.value = false
+  })
+}
+</script>
+
+<style scoped>
+
+</style>

+<template>
+  <el-steps :active="activeStep" align-center>
+    <el-step :title="language==0?'教练/领队/其他':'Coach/Team Leader/Other'" />
+    <el-step :title="language==0?'选手报名':'Participant Registration'" />
+    <el-step :title="language==0?'提交审核':'Submit for review'" />
+  </el-steps>
+</template>
+
+<script setup>
+import cache from "@/plugins/cache";
+const language = ref(cache.local.get('language') || 0)
+const props = defineProps({
+  activeStep: {
+    type: Number,
+    required: true
+  }
+})
+</script>
+
+<style scoped>
+
+</style>

@@ -45,7 +45,7 @@
     </div>
     </div>
   </div>
   </div>
 
 
-  <el-empty image="@/assets/img/order_no.png" image-size="228" v-if="list?.length == 0" description=" "/>
+  <el-empty image="@/assets/img/order_no.png" :image-size="228" v-if="list?.length == 0" description=" "/>
 </template>
 </template>
 
 
 <script setup>
 <script setup>

@@ -8,15 +8,12 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+import cache from "@/plugins/cache";
+const language = ref(cache.local.get('language') || 0)
 const props = defineProps({
 const props = defineProps({
   activeStep: {
   activeStep: {
     type: Number,
     type: Number,
     required: true
     required: true
-  },
-  language: {
-    type: Number,
-    required: true,
-    default: 0
   }
   }
 })
 })
 </script>
 </script>

+<template>
+  <el-table :data="list" border style="width: 100%">
+    <el-table-column :label="language==0?'组别代码':'Group code'" width="120px" prop="zuName"/>
+    <el-table-column :label="language==0?'组别':'Group'" prop="project.name"/>
+    <el-table-column :label="language==0?'舞种':'Dance Style'" width="120px" prop="project.danceType"/>
+    <el-table-column :label="language==0?'参赛说明':'Participation Instructions'" prop="project.remarks"/>
+    <el-table-column :label="language==0?'参赛运动员':'Participating athletes'" width="120px">
+      <template #default="scope">
+        <div>
+          <span v-for="s in scope.row.athletes">{{ s.name }},</span>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column :label="language==0?'报名费':'Registration Fee'" width="120px" prop="">
+      <template #default="scope">
+        <div class="text-primary">
+          ¥{{ scope.row.project.serviceFee }}
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column  v-if="hasAction" :label="language==0?'操作':'Actions'" fixed="right" width="150" align="center">
+      <template #default="scope">
+        <el-button  type="primary" link  @click="remove(scope.row.signId)">
+          {{language == 0 ? '删除' : 'Delete' }}
+        </el-button>
+
+      </template>
+    </el-table-column>
+  </el-table>
+
+</template>
+
+<script setup>
+const emit = defineEmits(['delete'])
+const props = defineProps({
+  list: {
+    type: Array,
+    required: true
+  },
+  hasAction:{
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+import cache from "@/plugins/cache";
+const language = ref(cache.local.get('language') || 0)
+const remove = (id) => {
+  emit('delete', id)
+}
+</script>
+
+<style scoped>
+
+</style>

@@ -111,7 +111,7 @@
                   </table>
                   </table>
                 </div>
                 </div>
 
 
-                <el-empty image="@/assets/img/order_no.png" image-size="228"  v-if="matchData.cptProjectList?.length == 0" description=" "/>
+                <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="matchData.cptProjectList?.length == 0" description=" "/>
               </div>
               </div>
             </div>
             </div>
             <match-schedule-list :match-data="matchData"  v-if="menu[2].active==1"/>
             <match-schedule-list :match-data="matchData"  v-if="menu[2].active==1"/>
@@ -141,11 +141,11 @@
                   </div>
                   </div>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
-              <el-empty image="@/assets/img/order_no.png" image-size="228" v-if="(signDoneGroupList==null)||(signDoneGroupList.length==0)" description="" />
+              <el-empty image="@/assets/img/order_no.png" :image-size="228" v-if="(signDoneGroupList==null)||(signDoneGroupList.length==0)" description="" />
             </div>
             </div>
             <div v-if="menu[4].active==1">
             <div v-if="menu[4].active==1">
 <!--              成绩-->
 <!--              成绩-->
-              <el-empty image="@/assets/img/order_no.png" image-size="228"  description="暂无成绩" />
+              <el-empty image="@/assets/img/order_no.png" :image-size="228"  description="暂无成绩" />
             </div>
             </div>
             <div v-if="menu[5].active==1" class="pd20">
             <div v-if="menu[5].active==1" class="pd20">
               <div class="xzbox" v-html="matchData.signKnow">
               <div class="xzbox" v-html="matchData.signKnow">
@@ -195,7 +195,7 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import { toRefs } from '@vueuse/shared'
 import { toRefs } from '@vueuse/shared'
-import { ElMessage } from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 const data = reactive({
 const data = reactive({
   matchData: {},
   matchData: {},
@@ -205,13 +205,18 @@ const data = reactive({
   popupGroupList:false,
   popupGroupList:false,
   menu:[{name:'赛事详情',active:1},{name:'赛事设项',active:0},{name:'日程',active:0},{name:'参赛队',active:0},{name:'成绩',active:0},{name:'报名须知',active:0}],
   menu:[{name:'赛事详情',active:1},{name:'赛事设项',active:0},{name:'日程',active:0},{name:'参赛队',active:0},{name:'成绩',active:0},{name:'报名须知',active:0}],
   menu1:[{name:'分站赛',active:1},{name:'赛事详情',active:0},{name:'日程',active:0}],
   menu1:[{name:'分站赛',active:1},{name:'赛事详情',active:0},{name:'日程',active:0}],
-  signDoneGroupList: []
+  signDoneGroupList: [],
+  time:''
 })
 })
-const {matchData,matchId,groupId,activeName2,popupGroupList,menu,menu1,signDoneGroupList} = toRefs(data)
+const {time,matchData,matchId,groupId,activeName2,popupGroupList,menu,menu1,signDoneGroupList} = toRefs(data)
 const group = useUserStore().group
 const group = useUserStore().group
 const user = useUserStore().user
 const user = useUserStore().user
 onMounted(() => {
 onMounted(() => {
-  groupId.value = group.id
+  if(group){
+    groupId.value = group.id
+  } else {
+    groupId.value = 0
+  }
   match.getMaList().then((res) => {
   match.getMaList().then((res) => {
     if(route.params.id!=0){
     if(route.params.id!=0){
       matchId.value = route.params.id
       matchId.value = route.params.id
@@ -230,6 +235,8 @@ function getMatch(id) {
   if(id!=0)
   if(id!=0)
   match.getMatchById({ id: id }).then(res => {
   match.getMatchById({ id: id }).then(res => {
     matchData.value = res.data
     matchData.value = res.data
+    var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
   })
   })
 }
 }
 function getGroupListByCptId(id) {
 function getGroupListByCptId(id) {
@@ -255,8 +262,15 @@ function choseSignType() {
   // checkIsSign().then(() => {
   // checkIsSign().then(() => {
     if (matchData.value.signType == '0'||(matchData.value.signType == '2' && user.utype == '1')) {
     if (matchData.value.signType == '0'||(matchData.value.signType == '2' && user.utype == '1')) {
       // 个人报名
       // 个人报名
+      // router.push({
+      //   path: `${matchId.value}/singleSign`
+      // })
       router.push({
       router.push({
-        path: `${matchId.value}/singleSign`
+        name: `chooseCoach`,
+        query: {
+          matchId: matchId.value,
+          signType: matchData.value.signType
+        }
       })
       })
     }
     }
     if(matchData.value.signType == '1'||(matchData.value.signType == '2' && user.utype == '2')){
     if(matchData.value.signType == '1'||(matchData.value.signType == '2' && user.utype == '2')){

@@ -8,13 +8,13 @@
             <img  class="mauto w100" :src="fillImgUrl(matchData.coverUrl)" >
             <img  class="mauto w100" :src="fillImgUrl(matchData.coverUrl)" >
           </el-col>
           </el-col>
           <el-col  :lg="9" :md="12" :xl="10">
           <el-col  :lg="9" :md="12" :xl="10">
-            <h3>
+            <h3 class="m0">
               {{ matchData.name }}
               {{ matchData.name }}
             </h3>
             </h3>
             <p class="ppl"><label class="bm1">Playing Time：</label>{{matchData.beginTime?.slice(0,10)}} ~ {{ matchData.endTime?.slice(0,10) }}</p>
             <p class="ppl"><label class="bm1">Playing Time：</label>{{matchData.beginTime?.slice(0,10)}} ~ {{ matchData.endTime?.slice(0,10) }}</p>
             <p class="ppl"><label class="bm2">Event Level：</label>{{ matchData.level }}</p>
             <p class="ppl"><label class="bm2">Event Level：</label>{{ matchData.level }}</p>
-            <p class="ppl"><label class="bm3">Location：</label>{{ matchData.address }}</p>
-            <p class="ppl"><label class="bm4">Registration Deadline：</label>{{ matchData.signEndTime?.slice(0,10) }}</p>
+            <p class="ppl" v-if="matchData.address"><label class="bm3">Location：</label>{{ matchData.address }}</p>
+            <p class="ppl" v-if="matchData.signEndTime"><label class="bm4">Registration Deadline：</label>{{ matchData.signEndTime?.slice(0,10) }}</p>
           </el-col>
           </el-col>
           <el-col  :lg="8" :md="12" :xl="8" v-if="matchData.type=='0'">
           <el-col  :lg="8" :md="12" :xl="8" v-if="matchData.type=='0'">
             <p class="countDownTitle"><span>Registration deadline countdown</span></p>
             <p class="countDownTitle"><span>Registration deadline countdown</span></p>
@@ -111,7 +111,7 @@
                       </table>
                       </table>
                     </div>
                     </div>
 
 
-                <el-empty image="@/assets/img/order_no.png" image-size="228"  v-if="matchData.cptProjectList?.length == 0" description=" "/>
+                <el-empty image="@/assets/img/order_no.png" :image-size="228"  v-if="matchData.cptProjectList?.length == 0" description=" "/>
               </div>
               </div>
             </div>
             </div>
             <match-schedule-list :match-data="matchData"  v-if="menu[2].active==1"/>
             <match-schedule-list :match-data="matchData"  v-if="menu[2].active==1"/>
@@ -141,11 +141,11 @@
                   </div>
                   </div>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
-              <el-empty image="@/assets/img/order_no.png" image-size="228" v-if="(signDoneGroupList==null)||(signDoneGroupList.length==0)" description="" />
+              <el-empty image="@/assets/img/order_no.png" :image-size="228" v-if="(signDoneGroupList==null)||(signDoneGroupList.length==0)" description="" />
             </div>
             </div>
             <div v-if="menu[4].active==1">
             <div v-if="menu[4].active==1">
               <!--              成绩-->
               <!--              成绩-->
-              <el-empty image="@/assets/img/order_no.png" image-size="228"  description="" />
+              <el-empty image="@/assets/img/order_no.png" :image-size="228"  description="" />
             </div>
             </div>
             <div v-if="menu[5].active==1" class="pd20">
             <div v-if="menu[5].active==1" class="pd20">
               <div class="xzbox" v-html="matchData.signKnow">
               <div class="xzbox" v-html="matchData.signKnow">
@@ -197,7 +197,7 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 const { proxy } = getCurrentInstance()
 import * as match from '@/apiPc/match'
 import * as match from '@/apiPc/match'
 import { toRefs } from '@vueuse/shared'
 import { toRefs } from '@vueuse/shared'
-import { ElMessage } from 'element-plus'
+import {dayjs, ElMessage} from 'element-plus'
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
 const user = useUserStore().user || {}
 const user = useUserStore().user || {}
 const group = useUserStore().group || {}
 const group = useUserStore().group || {}
@@ -210,11 +210,16 @@ const data = reactive({
   menu:[{name:'Event details',active:1},{name:'Event settings',active:0},{name:'Schedule',active:0},{name:'Participating teams',active:0},
   menu:[{name:'Event details',active:1},{name:'Event settings',active:0},{name:'Schedule',active:0},{name:'Participating teams',active:0},
     {name:'Achievement',active:0},{name:'Notes',active:0}],
     {name:'Achievement',active:0},{name:'Notes',active:0}],
   menu1:[{name:'Station race',active:1},{name:'Event details',active:0},{name:'Schedule',active:0}],
   menu1:[{name:'Station race',active:1},{name:'Event details',active:0},{name:'Schedule',active:0}],
-  signDoneGroupList: []
+  signDoneGroupList: [],
+  time:''
 })
 })
-const {matchData,matchId,groupId,activeName2,popupGroupList,menu,menu1,signDoneGroupList} = toRefs(data)
+const {matchData,matchId,groupId,activeName2,popupGroupList,menu,menu1,signDoneGroupList,time} = toRefs(data)
 onMounted(() => {
 onMounted(() => {
-  groupId.value = group.id
+  if(group){
+    groupId.value = group.id
+  } else {
+    groupId.value = 0
+  }
   match.getMaList().then((res) => {
   match.getMaList().then((res) => {
     if(route.params.id!=0){
     if(route.params.id!=0){
       matchId.value = route.params.id
       matchId.value = route.params.id
@@ -232,6 +237,8 @@ function getMatch(id) {
   if(id!=0)
   if(id!=0)
     match.getMatchById({ id: id }).then(res => {
     match.getMatchById({ id: id }).then(res => {
       matchData.value = res.data
       matchData.value = res.data
+      var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
     })
     })
 }
 }
 function getGroupListByCptId(id) {
 function getGroupListByCptId(id) {
@@ -257,9 +264,13 @@ function choseSignType() {
   // checkIsSign().then(() => {
   // checkIsSign().then(() => {
     if (matchData.value.signType == '0'||(matchData.value.signType == '2' && user.utype == '1')) {
     if (matchData.value.signType == '0'||(matchData.value.signType == '2' && user.utype == '1')) {
       // 个人报名
       // 个人报名
-        router.push({
-          path: `${route.params.id}/singleSign`
-        })
+      router.push({
+        name: `chooseCoach`,
+        query: {
+          matchId: matchId.value,
+          signType: matchData.value.signType
+        }
+      })
     }
     }
     if(matchData.value.signType == '1'||(matchData.value.signType == '2' && user.utype == '2')){
     if(matchData.value.signType == '1'||(matchData.value.signType == '2' && user.utype == '2')){
       router.push({
       router.push({
@@ -289,6 +300,7 @@ function checkIsSign() {
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
+.m0{margin: 0;}
 .indexTitle{margin: 20px 0 12px;
 .indexTitle{margin: 20px 0 12px;
   h3{
   h3{
     font-size: 20px;
     font-size: 20px;

 <template>
 <template>
-  <div>
-    <div class="box">
+  <div style="min-height: 100vh">
+    <div class="box" v-if="!errorBox">
       <el-card :body-style="{ padding: '0px' }" class="mt20">
       <el-card :body-style="{ padding: '0px' }" class="mt20">
         <div slot="header">
         <div slot="header">
-          <div class="bg-lineg">报名缴费清单</div>
+          <div class="bg-lineg">{{ language == 0 ? '报名缴费清单' : 'Registration Payment List' }}</div>
         </div>
         </div>
-        <div class="pd20">
-          <div class="border-info">
-            <el-row>
-              <el-col :lg="8">
-                <div class="item"><label>赛事名称</label>{{ matchInfo.name }}</div>
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>赛事类型</label>{{ matchInfo.name }}</div>
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>赛事时间</label>{{ matchInfo.beginTime?.slice(0, 10) }} 至
-                  {{ matchInfo.endTime?.slice(0, 10) }}
-                </div>
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>报名时间</label>{{ matchInfo.signBeginTime?.slice(0, 10) }}
-                  至{{ matchInfo.signEndTime?.slice(0, 10) }}
-                </div>
-              </el-col>
-              <el-col :lg="16">
-                <div class="item"><label>比赛地址</label>{{ matchInfo.address }}</div>
-              </el-col>
-            </el-row>
-
-          </div>
-          <div class="border-info gray mt20">
-            <el-row>
-              <el-col :lg="8">
-                <div class="item"><label>团队名称</label>{{ matchInfo.signFee }}</div>
-                <div class="item"><label>团队类型</label>{{ matchInfo.signFee }}</div>
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>负责人姓名</label>{{ matchInfo.signFee }}</div>
-                <div class="item"><label>参赛队名称</label>{{ matchInfo.signFee }}</div>
-
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>邮箱</label>{{ matchInfo.signFee }}</div>
-                <div class="item"><label>详细地址</label>{{ matchInfo.signFee }}</div>
-              </el-col>
-            </el-row>
-          </div>
-          <div class="border-info mt20">
-            <el-row>
-              <el-col :lg="8">
-                <div class="item"><label>教练</label>{{ matchInfo.signFee }}</div>
-                <div class="item"><label>翻译</label>{{ matchInfo.signFee }}</div>
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>领队</label>{{ matchInfo.signFee }}</div>
-                <div class="item"><label>官员</label>{{ matchInfo.signFee }}</div>
-              </el-col>
-              <el-col :lg="8">
-                <div class="item"><label>队医</label>{{ matchInfo.signFee }}</div>
-                <div class="item"><label>其他</label>{{ matchInfo.signFee }}</div>
-              </el-col>
-            </el-row>
-          </div>
-
-          <div class="mt20">
-            <div class="leftboderTT">参赛人员保险费</div>
+        <match-info-row v-if="matchId" :match-id="matchId"/>
+        <div v-if="isLogin">
+          <group-info-row v-if="groupId" :group-id="groupId"/>
+          <coach-info-row v-if="groupId" :group-id="groupId" :match-id="matchId"/>
+          <div class="pd20">
+            <div class="leftboderTT">{{ language == 0 ? '参赛人员保险费' : 'Participant Insurance Fee' }}</div>
             <!--            人员列表-->
             <!--            人员列表-->
-            <el-table :data="tableData" border style="width: 100%" class="mt20" :span-method="arraySpanMethod">
-              <el-table-column label="所属国家"/>
-              <el-table-column prop="name" label="姓氏" width="180" align="center"></el-table-column>
-              <el-table-column label="名"/>
-              <el-table-column label="短名"/>
-              <el-table-column prop="sex" label="性别" width="180" align="center"></el-table-column>
-              <el-table-column prop="age" label="年龄" width="180" align="center"></el-table-column>
-              <el-table-column label="出生日期" align="center"/>
-              <el-table-column prop="phone" label="手机号码" width="180" align="center"></el-table-column>
-              <el-table-column label="邮箱"/>
-              <el-table-column label="证件类型" align="center"/>
-              <el-table-column label="证件号码"/>
-              <el-table-column label="报项" fixed="right">
-                <template #default="scope">
-                  <ol>
-                    <li v-for="item in scope.row.items" :key="item.id">{{ item.name }}</li>
-                  </ol>
-                </template>
-              </el-table-column>
-              <el-table-column label="保险费" fixed="right" align="center">
-                <template #default="scope">
-                  <span class="text-primary">¥{{ scope.row.signFee }}/人</span>
-                </template>
-              </el-table-column>
-            </el-table>
+            <sign-info-table class="mt20" v-if="matchId" :match-id="matchId" :list="signInfoList" :hasAction="false"/>
           </div>
           </div>
-
-          <div class="mt20">
-            <div class="leftboderTT">参赛设项报名费</div>
-            <!--            报项列表-->
-            <el-table :data="tableData" border style="width: 100%" class="mt20">
-              <el-table-column label="组别代码" align="center"/>
-              <el-table-column label="组别" align="center"/>
-              <el-table-column label="舞种" align="center"/>
-              <el-table-column label="参赛说明"/>
-              <el-table-column label="参赛运动员"/>
-              <el-table-column label="补充信息"/>
-              <el-table-column label="报名费" align="center">
-                <template #default="scope">
-                  <span class="text-primary">¥{{ scope.row.signFee }}/人</span>
-                </template>
-              </el-table-column>
-            </el-table>
+          <div class="pd20">
+            <div class="leftboderTT">{{ language == 0 ? '参赛设项报名费' : 'Registration Fee for Event Entry' }}</div>
+            <zu-table class="mt20" :list="zuTableList" :hasAction="false"/>
           </div>
           </div>
         </div>
         </div>
-
+        <div v-else class="pd20 skeletonBox">
+          <el-skeleton :rows="8"/>
+          <el-button type="primary" class="w200px btn-lineG" round>登录后查看详细报项信息</el-button>
+        </div>
       </el-card>
       </el-card>
 
 
       <el-card class="mt20 mb20">
       <el-card class="mt20 mb20">
         <el-row class="result">
         <el-row class="result">
           <el-col :lg="12">
           <el-col :lg="12">
-            <div class="text-success flex" v-if="approved">
+            <div class="text-warning flex" v-if="form.auditStatus=='1'">
+              <img src="@/assets/img/ing.png">
+              报名信息审核中
+            </div>
+            <div class="text-success flex" v-if="form.auditStatus=='2'">
               <img src="@/assets/img/r.png">
               <img src="@/assets/img/r.png">
-              报名信息审核通过</div>
-            <div class="text-danger flex" v-else>
-              <img src="@/assets/img/w.png">报名信息审核拒绝</div>
+              报名信息审核通过
+            </div>
+            <div class="text-danger flex" v-if="form.auditStatus=='3'">
+              <img src="@/assets/img/w.png">报名信息审核拒绝
+            </div>
           </el-col>
           </el-col>
           <el-col :lg="12">
           <el-col :lg="12">
-            <div class="priceb">待支付金额：<span class="price">¥1840.00</span></div>
+            <div class="priceb" v-if="form.payStatus=='0'">待支付金额：<span class="price">¥{{ Number(totalFee).toFixed(2) }}</span></div>
+            <div class="priceb" v-if="form.payStatus=='1'">已支付金额：<span class="price">¥{{ Number(totalFee).toFixed(2) }}</span></div>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-card>
       </el-card>
-      <el-card class="mb60" v-if="approved">
-        <div class="leftboderTT">选择支付方式</div>
+      <el-card class="mb60" v-if="form.auditStatus=='2'&&form.payStatus=='0'">
+        <div class="leftboderTT">{{ language==0?'选择支付方式':'Choose payment method' }}</div>
         <div class="mt20">
         <div class="mt20">
           <el-radio-group v-model="payType">
           <el-radio-group v-model="payType">
-<!--            <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="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" border>
             <el-radio label="2" border>
-              <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40"><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><path d="M1398.822642 381.998922c-9.384367 19.320755-20.424798 38.641509-32.017251 57.962264v263.866307h-31.465229V485.226954c-13.248518 18.216712-27.049057 34.225337-40.297574 48.025876-3.864151-7.17628-14.352561-23.736927-20.424798-30.361186 34.777358-33.673315 71.210782-82.803235 93.843666-131.933153l30.361186 11.040431z m-8.280324-91.63558c-22.632884 36.985445-59.066307 78.939084-91.635579 105.98814-4.416173-7.17628-13.248518-19.320755-19.320755-25.945013 29.809164-23.736927 62.378437-61.274394 78.939083-92.187601l32.017251 12.144474z m181.615094 289.811321c1.656065 7.728302 6.072237 19.320755 8.832345 24.84097-55.754178 37.537466-66.242588 46.369811-72.866846 54.650135-1.656065-7.728302-8.280323-22.080863-12.696496-28.705121 4.968194-3.312129 12.696496-10.48841 12.696496-28.705121v-54.098114h-60.17035v27.049057c0 38.641509-7.728302 91.083558-42.505661 128.069003-4.416173-7.17628-16.560647-19.320755-22.632884-23.184906 29.809164-31.465229 34.225337-72.866846 34.225337-105.436119v-54.098113h118.684636v82.251213l36.433423-22.632884z m123.100809-176.094879c-9.384367 73.970889-23.184906 136.349326-48.025876 187.687332 16.560647 36.433423 39.193531 66.242588 67.346631 83.355256-7.17628 6.072237-17.112668 18.216712-22.632884 27.049057-25.945013-18.216712-46.369811-45.265768-62.930459-78.939084-20.424798 32.017251-45.81779 59.066307-78.939083 81.699191-3.864151-6.624259-13.248518-19.872776-19.872776-25.392992 36.985445-22.632884 64.034501-52.99407 83.907277-89.979514-12.696496-34.777358-22.080863-73.418868-28.705121-115.372507-4.968194 11.040431-10.48841 22.632884-16.560647 31.465229-3.864151-4.416173-10.48841-13.248518-17.112668-20.424798v5.520216h-154.014017v-29.809165h154.014017v9.384367c24.84097-49.129919 37.537466-118.684636 44.713746-191.551483l31.465229 4.968195c-3.864151 31.465229-8.280323 61.274394-13.800539 90.531536h96.051752v29.809164h-14.904582z m-142.973585 22.632884h-145.181671v-110.404312h24.84097v82.251213h35.32938V278.770889h26.497035v119.78868h33.673316V316.308356h25.392992v110.404312z m55.202156-22.632884c-1.656065 6.624259-3.312129 12.696496-4.416172 18.768734 6.072237 46.369811 14.904582 91.083558 28.1531 130.277088 16.560647-43.057682 26.497035-91.63558 32.569272-149.045822h-56.3062zM1882.393531 289.259299c-10.48841 31.465229-24.288949 62.378437-39.193531 91.63558v324.036657h-32.017251V437.201078c-13.800539 22.632884-29.257143 42.50566-44.161725 60.170351-3.312129-7.728302-13.248518-24.288949-19.320754-32.017251 41.953639-45.265768 80.043127-114.820485 103.780053-184.927224l30.913208 8.832345z m288.707278 65.690566v29.257143h-294.779515v-29.257143h294.779515z m-267.730459 199.831806h235.713208v147.941779h-30.913208v-16.560647h-174.438814v18.216712h-30.361186v-149.597844z m231.297035-104.332075H1909.994609v-28.1531h224.672776v28.1531zM1909.994609 486.883019h224.672776v28.1531H1909.994609v-28.1531z m23.736927 96.603773V656.90566h174.438814v-73.418868h-174.438814z m81.699192-231.297035c-6.072237-16.560647-20.424798-43.057682-32.017251-61.826415l29.257143-12.144474c13.248518 19.320755 27.601078 44.161725 34.225337 60.722372l-31.465229 13.248517zM2586.221024 468.114286c-26.497035 63.48248-69.002695 111.508356-122.548787 147.941779 50.785984 25.945013 110.956334 43.609704 180.511051 52.442048-7.728302 8.280323-16.560647 23.184906-21.528841 33.673316-75.074933-11.592453-139.661456-32.569272-192.655525-64.034502-57.962264 32.017251-125.308895 52.99407-195.415634 66.794609-3.312129-9.384367-12.696496-25.392992-19.320754-33.121293 66.242588-10.48841 129.173046-28.1531 183.271159-55.202157-44.161725-32.017251-78.939084-72.866846-103.780054-123.65283l10.48841-3.864151h-49.12992v-34.225337h155.670081V383.654987h-176.6469v-34.225337h176.6469V278.770889h35.32938v70.658761h177.750944v34.225337h-177.750944v71.210781H2555.859838l7.176281-1.656064 23.184905 14.904582z m-255.033962 20.976819c23.184906 43.609704 56.858221 80.043127 100.467925 108.748248 44.161725-28.1531 80.043127-63.48248 104.332075-108.748248h-204.8zM2834.630728 292.571429c-13.800539 34.777358-30.361186 69.554717-49.129919 101.571967v308.580054h-34.225337V447.689488c-14.904582 20.976819-31.465229 40.297574-46.921833 56.306199-4.416173-7.728302-14.904582-25.945013-21.528841-34.225337 47.473854-45.265768 91.63558-115.924528 118.132614-188.239353l33.673316 11.040432z m270.490566 123.65283h-58.514286v240.12938c0 25.945013-7.728302 36.985445-24.84097 41.953639-18.216712 5.520216-49.129919 6.072237-99.915903 5.520215-1.656065-8.832345-8.280323-24.84097-13.248518-34.225337 39.193531 1.656065 77.283019 1.656065 88.32345 1.104043 10.48841-1.104043 14.352561-3.864151 14.352561-14.35256V416.224259h-187.687332v-34.225337h187.687332V283.739084h34.777359v97.707816h58.514285v34.777359z m-184.375202 178.854986c-13.800539-28.705121-43.609704-78.939084-67.346631-115.924528l29.809164-13.800539c24.288949 35.881402 55.202156 84.459299 70.106739 112.612399l-32.569272 17.112668z" fill="#595757" p-id="24749"></path></svg>
+              <svg t="1709002960407" class="icon" viewBox="0 0 3152 1024" version="1.1"
+                   xmlns="http://www.w3.org/2000/svg" p-id="24747" width="94" height="40">
+                <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>
+                <path
+                    d="M1398.822642 381.998922c-9.384367 19.320755-20.424798 38.641509-32.017251 57.962264v263.866307h-31.465229V485.226954c-13.248518 18.216712-27.049057 34.225337-40.297574 48.025876-3.864151-7.17628-14.352561-23.736927-20.424798-30.361186 34.777358-33.673315 71.210782-82.803235 93.843666-131.933153l30.361186 11.040431z m-8.280324-91.63558c-22.632884 36.985445-59.066307 78.939084-91.635579 105.98814-4.416173-7.17628-13.248518-19.320755-19.320755-25.945013 29.809164-23.736927 62.378437-61.274394 78.939083-92.187601l32.017251 12.144474z m181.615094 289.811321c1.656065 7.728302 6.072237 19.320755 8.832345 24.84097-55.754178 37.537466-66.242588 46.369811-72.866846 54.650135-1.656065-7.728302-8.280323-22.080863-12.696496-28.705121 4.968194-3.312129 12.696496-10.48841 12.696496-28.705121v-54.098114h-60.17035v27.049057c0 38.641509-7.728302 91.083558-42.505661 128.069003-4.416173-7.17628-16.560647-19.320755-22.632884-23.184906 29.809164-31.465229 34.225337-72.866846 34.225337-105.436119v-54.098113h118.684636v82.251213l36.433423-22.632884z m123.100809-176.094879c-9.384367 73.970889-23.184906 136.349326-48.025876 187.687332 16.560647 36.433423 39.193531 66.242588 67.346631 83.355256-7.17628 6.072237-17.112668 18.216712-22.632884 27.049057-25.945013-18.216712-46.369811-45.265768-62.930459-78.939084-20.424798 32.017251-45.81779 59.066307-78.939083 81.699191-3.864151-6.624259-13.248518-19.872776-19.872776-25.392992 36.985445-22.632884 64.034501-52.99407 83.907277-89.979514-12.696496-34.777358-22.080863-73.418868-28.705121-115.372507-4.968194 11.040431-10.48841 22.632884-16.560647 31.465229-3.864151-4.416173-10.48841-13.248518-17.112668-20.424798v5.520216h-154.014017v-29.809165h154.014017v9.384367c24.84097-49.129919 37.537466-118.684636 44.713746-191.551483l31.465229 4.968195c-3.864151 31.465229-8.280323 61.274394-13.800539 90.531536h96.051752v29.809164h-14.904582z m-142.973585 22.632884h-145.181671v-110.404312h24.84097v82.251213h35.32938V278.770889h26.497035v119.78868h33.673316V316.308356h25.392992v110.404312z m55.202156-22.632884c-1.656065 6.624259-3.312129 12.696496-4.416172 18.768734 6.072237 46.369811 14.904582 91.083558 28.1531 130.277088 16.560647-43.057682 26.497035-91.63558 32.569272-149.045822h-56.3062zM1882.393531 289.259299c-10.48841 31.465229-24.288949 62.378437-39.193531 91.63558v324.036657h-32.017251V437.201078c-13.800539 22.632884-29.257143 42.50566-44.161725 60.170351-3.312129-7.728302-13.248518-24.288949-19.320754-32.017251 41.953639-45.265768 80.043127-114.820485 103.780053-184.927224l30.913208 8.832345z m288.707278 65.690566v29.257143h-294.779515v-29.257143h294.779515z m-267.730459 199.831806h235.713208v147.941779h-30.913208v-16.560647h-174.438814v18.216712h-30.361186v-149.597844z m231.297035-104.332075H1909.994609v-28.1531h224.672776v28.1531zM1909.994609 486.883019h224.672776v28.1531H1909.994609v-28.1531z m23.736927 96.603773V656.90566h174.438814v-73.418868h-174.438814z m81.699192-231.297035c-6.072237-16.560647-20.424798-43.057682-32.017251-61.826415l29.257143-12.144474c13.248518 19.320755 27.601078 44.161725 34.225337 60.722372l-31.465229 13.248517zM2586.221024 468.114286c-26.497035 63.48248-69.002695 111.508356-122.548787 147.941779 50.785984 25.945013 110.956334 43.609704 180.511051 52.442048-7.728302 8.280323-16.560647 23.184906-21.528841 33.673316-75.074933-11.592453-139.661456-32.569272-192.655525-64.034502-57.962264 32.017251-125.308895 52.99407-195.415634 66.794609-3.312129-9.384367-12.696496-25.392992-19.320754-33.121293 66.242588-10.48841 129.173046-28.1531 183.271159-55.202157-44.161725-32.017251-78.939084-72.866846-103.780054-123.65283l10.48841-3.864151h-49.12992v-34.225337h155.670081V383.654987h-176.6469v-34.225337h176.6469V278.770889h35.32938v70.658761h177.750944v34.225337h-177.750944v71.210781H2555.859838l7.176281-1.656064 23.184905 14.904582z m-255.033962 20.976819c23.184906 43.609704 56.858221 80.043127 100.467925 108.748248 44.161725-28.1531 80.043127-63.48248 104.332075-108.748248h-204.8zM2834.630728 292.571429c-13.800539 34.777358-30.361186 69.554717-49.129919 101.571967v308.580054h-34.225337V447.689488c-14.904582 20.976819-31.465229 40.297574-46.921833 56.306199-4.416173-7.728302-14.904582-25.945013-21.528841-34.225337 47.473854-45.265768 91.63558-115.924528 118.132614-188.239353l33.673316 11.040432z m270.490566 123.65283h-58.514286v240.12938c0 25.945013-7.728302 36.985445-24.84097 41.953639-18.216712 5.520216-49.129919 6.072237-99.915903 5.520215-1.656065-8.832345-8.280323-24.84097-13.248518-34.225337 39.193531 1.656065 77.283019 1.656065 88.32345 1.104043 10.48841-1.104043 14.352561-3.864151 14.352561-14.35256V416.224259h-187.687332v-34.225337h187.687332V283.739084h34.777359v97.707816h58.514285v34.777359z m-184.375202 178.854986c-13.800539-28.705121-43.609704-78.939084-67.346631-115.924528l29.809164-13.800539c24.288949 35.881402 55.202156 84.459299 70.106739 112.612399l-32.569272 17.112668z"
+                    fill="#595757" p-id="24749"></path>
+              </svg>
             </el-radio>
             </el-radio>
             <el-radio label="3" border>
             <el-radio label="3" border>
-              <svg t="1709003441012" class="icon" viewBox="0 0 3527 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="32905" width="90" height="40"><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><path d="M679.569636 1.763556H1120.515413c53.532444 0 29.383111 45.966222 16.782223 102.542222l-178.460445 807.452444c-12.515556 56.405333-8.618667 102.4-62.264889 102.4H455.626524c-53.617778 0-86.812444-45.994667-74.211555-102.4L559.903858 104.305778C572.59008 47.729778 626.037191 1.763556 679.569636 1.763556" fill="#004380" p-id="32907"></path><path d="M1106.748302 1.763556h388.096c54.243556 0 87.921778 45.966222 75.178667 102.542222l-180.622222 807.452444c-12.771556 56.405333-67.043556 102.4-121.287111 102.4H880.245191c-54.272 0-87.921778-45.994667-75.235555-102.4L985.688747 104.305778C998.31808 47.729778 1052.504747 1.763556 1106.776747 1.763556" fill="#007A8A" p-id="32908"></path><path d="M1135.192747 604.416l-42.410667 173.568h11.434667l-8.874667 35.84h-11.320889l-2.673778 11.064889h-40.391111l2.759111-11.064889h-81.92l8.192-33.166222h8.334223l42.979555-176.241778 8.590222-35.527111h41.130667l-4.323556 17.92s10.979556-9.756444 21.361778-13.084445c10.382222-3.413333 70.001778-4.636444 70.001778-4.636444l-8.817778 35.328h-14.051555z m-72.533334 0l-10.894222 44.373333s12.231111-6.855111 18.858667-9.102222c6.741333-2.218667 16.839111-2.958222 16.839111-2.958222l7.879111-32.312889H1062.687858z m-16.327111 66.304l-11.264 46.193778s12.515556-7.879111 19.143111-10.382222a188.586667 188.586667 0 0 1 17.038223-3.470223l7.964444-32.341333h-32.881778z m-26.168889 107.690667h32.768l9.386667-38.968889H1029.692302l-9.500444 38.968889zM1186.108302 568.888889h40.704l0.398222 19.541333c-0.284444 3.328 1.934222 4.864 6.684445 4.864h8.277333l-7.566222 32.284445h-21.987556c-19.000889 1.763556-26.225778-8.789333-25.742222-20.650667L1186.108302 568.888889z" fill="#FEFEFE" p-id="32909"></path><path d="M1174.844302 721.635556h-46.08l7.907556-31.516445h52.650666l7.480889-28.814222h-51.968L1153.71008 625.777778h144.583111l-8.988444 35.555555H1240.75008l-7.566222 28.785778h48.64l-8.106667 31.516445h-52.508444l-9.386667 13.255111h21.333333l5.233778 39.708444c0.568889 3.953778 0.568889 6.542222 1.678222 8.248889 1.080889 1.393778 7.480889 2.133333 11.207111 2.133333h6.456889l-9.841777 38.599111h-16.440889c-2.503111 0-6.286222-0.199111-11.52-0.455111-4.892444-0.540444-8.362667-3.982222-11.690667-5.973333a18.403556 18.403556 0 0 1-8.590222-13.425778l-5.12-39.623111-23.950222 38.997333c-7.566222 12.373333-17.834667 21.788444-35.185778 21.788445h-33.422222l8.760888-34.503111h12.8c3.697778 0 6.912-1.706667 9.329778-3.214222a15.189333 15.189333 0 0 0 7.082667-7.025778l34.872889-58.510222zM677.635413 625.777778H793.603413l-8.590222 36.380444h-46.336l-7.224889 31.061334h47.416889l-8.675555 37.546666h-47.36l-11.52 50.517334c-1.393778 5.546667 11.264 6.257778 15.843555 6.257777l23.665778-4.266666L741.29408 824.888889h-53.418667c-4.323556 0-7.509333-0.824889-12.145777-2.190222-4.494222-1.507556-6.485333-4.152889-8.476445-8.135111-1.934222-4.124444-4.977778-7.480889-2.901333-16.327112l15.36-66.816h-26.339556l8.760889-38.200888h26.396445l7.025777-31.061334h-26.311111L677.635413 625.777778zM770.648747 583.822222h50.972444l-9.244444 27.363556h-69.632l-7.537778 5.745778c-3.242667 2.787556-4.352 1.649778-8.590222 3.640888a55.779556 55.779556 0 0 1-22.897778 5.205334h-22.300445l8.988445-26.282667h6.712889c5.632 0 9.528889-0.455111 11.491555-1.536 2.218667-1.28 4.721778-4.039111 7.452445-8.533333l12.885333-20.536889h50.602667l-8.903111 14.933333zM837.606969 569.088h48.355555l-7.082666 24.120889s15.303111-12.117333 25.998222-16.469333c10.638222-3.868444 34.730667-7.395556 34.730667-7.395556L1017.887858 568.888889l-26.652445 87.950222c-4.522667 15.018667-9.756444 24.746667-13.027555 29.212445a33.792 33.792 0 0 1-13.198222 12.032 49.806222 49.806222 0 0 1-18.119112 6.058666c-5.176889 0.369778-13.084444 0.483556-24.092444 0.654222H847.363413l-21.191111 69.461334c-2.019556 6.940444-2.986667 10.24-1.649778 12.117333a8.732444 8.732444 0 0 0 7.168 3.470222l33.28-3.100444L853.564302 824.888889h-37.148444c-11.861333 0-20.48-0.284444-26.510222-0.739556-5.745778-0.483556-11.719111 0-15.786667-3.015111-3.413333-3.043556-8.704-7.054222-8.590222-11.093333 0.369778-3.754667 1.991111-10.040889 4.380444-18.659556l67.697778-222.293333z m102.684444 88.746667H861.016747l-4.892445 15.815111h68.608c8.078222-0.938667 9.756444 0.199111 10.467556-0.170667l5.034666-15.644444z m-74.951111-14.279111s15.502222-14.023111 42.040889-18.545778c6.030222-1.137778 43.662222-0.739556 43.662222-0.739556l5.745778-18.830222H876.945636l-11.576889 38.115556z" fill="#FEFEFE" p-id="32910"></path><path d="M961.795413 711.111111l-4.494222 21.219556c-1.877333 6.656-3.555556 11.576889-8.561778 15.872-5.290667 4.465778-11.491556 9.159111-25.969777 9.159111l-26.823112 1.137778-0.199111 23.950222c-0.284444 6.741333 1.536 6.087111 2.588445 7.168 1.251556 1.223111 2.360889 1.678222 3.498666 2.161778l8.533334-0.483556 25.571555-1.422222L925.301191 824.888889h-29.383111c-20.536889 0-35.811556-0.483556-40.760889-4.408889-4.949333-3.128889-5.603556-7.025778-5.518222-13.767111l1.877333-93.496889h46.876445l-0.654223 19.114667h11.264c3.868444 0 6.485333-0.369778 8.078223-1.422223a8.448 8.448 0 0 0 3.128889-4.835555l4.721777-14.961778h36.835556zM368.529636 256c-1.564444 7.509333-30.976 142.933333-31.061334 143.075556-6.314667 27.392-10.922667 46.933333-26.567111 59.534222a47.388444 47.388444 0 0 1-31.288889 10.894222c-19.285333 0-30.549333-9.585778-32.426666-27.761778l-0.398223-6.257778s5.888-36.693333 5.888-36.892444c0 0 30.862222-123.448889 36.408889-139.776 0.284444-0.910222 0.341333-1.422222 0.426667-1.848889-60.046222 0.540444-70.712889 0-71.424-0.967111-0.398222 1.336889-1.905778 8.988444-1.905778 8.988444l-31.516444 139.093334-2.673778 11.832889-5.262222 38.599111c0 11.434667 2.275556 20.764444 6.741333 28.672C197.834524 508.245333 238.76608 512 261.919858 512c29.866667 0 57.856-6.314667 76.771555-17.891556 32.824889-19.370667 41.415111-49.664 49.095111-76.600888l3.527112-13.795556s31.800889-128.199111 37.205333-144.896c0.199111-0.910222 0.284444-1.422222 0.568889-1.848889-43.576889 0.455111-56.433778 0-60.558222-0.967111M548.042524 482.645333a453.518222 453.518222 0 0 0-45.397333 0.910223l-0.796444-1.763556c1.820444-8.846222 3.811556-17.521778 5.603555-26.453333l2.588445-12.060445c3.896889-18.716444 7.68-40.476444 8.106666-47.160889 0.426667-3.982222 1.706667-13.937778-8.732444-13.937777-4.352 0-8.903111 2.304-13.539556 4.693333-2.56 9.955556-7.651556 37.973333-10.097777 50.716444-5.205333 26.88-5.546667 29.980444-7.879112 43.264l-1.507555 1.792c-18.545778-0.341333-25.031111-0.341333-46.364445 0.910223l-0.938666-2.019556c3.527111-15.928889 7.111111-32.056889 10.496-48.042667 8.96-43.349333 11.093333-59.904 13.539555-81.948444l1.706667-1.28c20.849778-3.242667 25.884444-3.896889 48.440889-8.931556l1.905778 2.332445-3.470223 13.795555c3.84-2.503111 7.480889-5.034667 11.320889-7.196444 10.638222-5.745778 22.471111-7.452444 28.956445-7.452445 9.927111 0 20.736 3.015111 25.230222 15.587556 4.266667 11.207111 1.422222 24.974222-4.181333 52.110222l-2.901334 13.880889a1275.761778 1275.761778 0 0 0-9.955555 56.462222l-2.133334 1.792zM607.206969 482.645333c-8.362667-0.085333-13.767111-0.341333-18.972445-0.085333-5.205333 0.085333-10.296889 0.455111-18.062222 0.995556l-0.398222-0.995556-0.512-1.052444c2.133333-11.605333 3.271111-15.616 4.323556-19.740445 1.080889-4.152889 2.048-8.248889 3.925333-20.024889 2.446222-15.36 3.953778-26.083556 4.920889-35.498666 1.137778-9.102222 1.735111-16.867556 2.616889-25.827556l0.568889-0.682667 0.682666-0.881777c8.305778-1.678222 13.568-2.816 18.972445-4.067556 5.461333-1.024 10.922667-2.616889 19.512889-5.006222l0.312888 1.052444 0.256 1.137778c-1.592889 9.500444-3.242667 19.000889-4.807111 28.643556-1.507556 9.671111-3.128889 19.143111-4.608 28.643555-3.100444 20.195556-4.352 27.761778-5.091555 33.223111-0.711111 5.091556-0.910222 7.907556-2.104889 18.346667l-0.796445 0.938667-0.739555 0.853333zM790.474524 412.216889c6.684444-30.492444 1.450667-44.743111-5.12-53.418667-9.955556-13.226667-27.562667-17.464889-45.795555-17.464889-10.979556 0-37.148444 1.137778-57.571556 20.650667-14.677333 14.108444-21.447111 33.223111-25.543111 51.541333-4.124444 18.688-8.874667 52.309333 20.935111 64.796445 9.216 4.096 22.471111 5.233778 31.004445 5.233778 21.845333 0 44.259556-6.257778 61.098666-24.746667 12.970667-15.047111 18.887111-37.376 20.963556-46.592m-50.119111-2.190222c-0.967111 5.176889-5.319111 24.291556-11.178667 32.426666-4.096 6.030222-8.931556 9.671111-14.307555 9.671111-1.592889 0-11.093333 0-11.235556-14.620444-0.056889-7.224889 1.336889-14.592 3.100445-22.584889 5.034667-23.096889 10.951111-42.496 26.140444-42.496 11.889778 0 12.743111 14.449778 7.480889 37.603556M1249.653191 482.787556c-15.644444-0.170667-20.138667-0.170667-34.616889 0.768l-0.881778-1.820445c3.896889-23.011556 7.822222-45.937778 11.320889-69.205333 4.551111-30.179556 5.575111-43.008 7.054223-60.672l1.166222-1.479111c15.559111-3.413333 19.911111-4.408889 36.067555-9.045334l0.455111 2.076445c-2.958222 19.000889-5.859556 37.859556-8.760888 56.917333-5.944889 39.793778-8.106667 59.989333-10.382223 80.782222l-1.422222 1.706667z" fill="#FEFEFE" p-id="32911"></path><path d="M1231.078969 400.497778c-5.916444-15.644444-2.275556-47.217778-26.140445-57.827556-9.187556-4.181333-30.72 1.194667-49.265777 20.650667-13.056 13.880889-19.313778 32.938667-22.840889 51.2-3.754667 18.403556-8.049778 51.996444 18.631111 64 8.504889 4.152889 16.128 5.404444 23.893333 4.949333 26.794667-1.649778 47.217778-48.384 62.378667-66.844444 11.662222-14.620444-2.816-6.144-6.656-16.128z m-18.887111 10.439111c-1.052444 4.949333-5.006222 24.234667-10.268445 32.312889-3.527111 5.745778-11.889778 9.301333-16.725333 9.301333-1.365333 0-9.784889 0-10.097778-14.336-0.056889-7.139556 1.223111-14.506667 2.816-22.584889 4.579556-22.670222 9.870222-41.870222 23.552-41.870222 10.723556 0 15.303111 13.966222 10.723556 37.176889M912.472747 482.645333a452.408889 452.408889 0 0 0-45.368889 0.910223l-0.796445-1.763556c1.820444-8.846222 3.868444-17.521778 5.745778-26.453333l2.446222-12.060445c3.982222-18.716444 7.736889-40.476444 8.135111-47.160889 0.398222-3.982222 1.649778-13.937778-8.675555-13.937777-4.494222 0-8.988444 2.304-13.653333 4.693333-2.446222 9.955556-7.68 37.973333-10.183112 50.716444-5.063111 26.88-5.404444 29.980444-7.708444 43.264l-1.592889 1.792a469.788444 469.788444 0 0 0-46.307555 0.910223l-0.938667-2.019556c3.555556-15.928889 7.111111-32.056889 10.524444-48.042667 8.931556-43.349333 11.008-59.904 13.511111-81.948444l1.592889-1.28c20.821333-3.242667 25.969778-3.896889 48.526223-8.931556l1.706666 2.332445-3.214222 13.795555c3.697778-2.503111 7.509333-5.034667 11.292444-7.196444 10.552889-5.745778 22.471111-7.452444 28.956445-7.452445 9.784889 0 20.650667 3.015111 25.315555 15.587556 4.181333 11.207111 1.308444 24.974222-4.352 52.110222l-2.844444 13.880889a992.568889 992.568889 0 0 0-9.955556 56.462222l-2.161777 1.792zM1102.538524 335.815111c-3.043556 16.952889-12.032 31.175111-23.580444 38.087111-9.500444 5.831111-21.134222 6.314667-33.137778 6.314667h-7.765333l0.568889-3.811556 14.250666-75.918222 0.455112-3.896889 0.199111-2.986666 5.717333 0.739555 30.208 3.157333c11.662222 5.518222 16.440889 19.740444 13.084444 38.314667m-18.773333-79.445333l-14.478222 0.142222c-37.546667 0.568889-52.622222 0.426667-58.794667-0.512l-1.507555 9.301333-13.454223 76.458667-33.735111 169.955556c32.796444-0.483556 46.250667-0.483556 51.911111 0.284444 1.28-7.651556 8.874667-52.992 8.96-52.992 0 0 6.456889-33.251556 6.855112-34.474667 0 0 2.048-3.470222 4.067555-4.835555h3.015111c28.273778 0 60.216889 0 85.248-22.528 17.038222-15.473778 28.672-38.286222 33.848889-66.048 1.393778-6.798222 2.360889-14.876444 2.360889-22.983111 0-10.638222-1.735111-21.134222-6.769778-29.354667-12.771556-21.845333-38.200889-22.272-67.527111-22.414222M1438.438969 315.022222L1436.447858 312.888889c-25.429333 4.835556-30.037333 5.603556-53.447111 8.561778l-1.706667 1.621333c-0.085333 0.256-0.142222 0.654222-0.284444 1.024l-0.056889-0.369778c-17.436444 37.660444-16.924444 29.525333-31.089778 59.164445-0.085333-1.336889-0.085333-2.161778-0.142222-3.612445l-3.555556-64.284444-2.247111-2.104889c-26.652444 4.835556-27.306667 5.603556-51.911111 8.561778l-1.905778 1.621333c-0.284444 0.768-0.284444 1.592889-0.426667 2.531556l0.142223 0.312888c3.072 14.762667 2.332444 11.463111 5.404444 34.730667 1.479111 11.434667 3.384889 22.926222 4.835556 34.190222 2.417778 18.887111 3.783111 28.16 6.741333 57.002667-16.64 25.713778-20.565333 35.470222-36.579556 58.026667l1.024 2.133333c24.007111-0.853333 29.582222-0.853333 47.388445-0.853333l3.868444-4.124445c13.454222-27.192889 115.939556-192 115.939556-192M615.398969 363.832889c11.832889-6.4 13.312-15.217778 3.384889-19.797333-10.069333-4.636444-27.733333-3.128889-39.623111 3.242666-11.861333 6.257778-13.226667 15.160889-3.185778 19.854222 9.898667 4.494222 27.648 3.157333 39.424-3.299555M1298.264747 568.888889l-12.686223 35.555555c-3.982222 12.174222-11.434667 21.248-23.239111 21.333334l-20.167111-0.568889 5.888-32h3.953778c2.048 0 3.527111-0.170667 4.664889-1.109333 1.024-0.568889 1.763556-1.877333 2.588444-3.84l7.480889-19.370667h31.516445z" fill="#FEFEFE" p-id="32912"></path><path d="M3499.95008 747.576889c-5.148444-1.706667-10.524444-2.56-15.957333-2.503111a40.334222 40.334222 0 0 0-35.413334 30.151111v91.619555h-39.879111v-153.6h32.910222l2.730667 27.164445h0.995556a53.134222 53.134222 0 0 1 43.633777-31.004445c6.257778-0.170667 12.430222 0.938667 18.204445 3.328l-7.224889 34.844445z m-59.591111-179.114667h-63.800889a1286.144 1286.144 0 0 1-42.666667-204.231111h-14.193777v164.067556a16.184889 16.184889 0 0 0 15.957333 16.298666h17.720889v23.438223h-69.319111a27.676444 27.676444 0 0 1-28.16-27.619556v-176.184889h-27.676445v-23.836444h27.676445v-169.528889h63.800889v169.528889h121.656888v23.893333h-43.121777a1378.104889 1378.104889 0 0 0 42.126222 204.174222z m-104.675556-243.2a742.542222 742.542222 0 0 0 35.640889-143.530666h63.317334a835.811556 835.811556 0 0 1-34.673778 143.530666h-64.284445z m-106.467555 353.991111a50.062222 50.062222 0 0 0-16.213334-3.271111c-11.946667 0-18.688 7.111111-18.688 24.149334v13.169777h28.928v31.800889H3194.314524v121.770667h-40.135111v-121.742222h-20.679111v-29.952l20.679111-1.621334v-12.629333a49.863111 49.863111 0 0 1 53.361778-56.775111c9.955556 0 19.854222 1.848889 29.155556 5.461333l-7.480889 29.639111z m-59.335111-461.169777a12.458667 12.458667 0 0 0-13.454223-11.690667h-54.613333a11.946667 11.946667 0 0 0-12.686222 11.662222v217.656889h-49.379556v-225.564444a28.956444 28.956444 0 0 1 30.435556-28.046223h117.902222a29.098667 29.098667 0 0 1 30.919111 28.046223v225.564444h-49.123555V218.083556z m42.638222 351.488h-54.840889l-19.456-68.209778c-8.078222 23.893333-18.858667 46.791111-32.142222 68.209778h-62.577778a323.271111 323.271111 0 0 0 57.827556-195.413334V241.976889h55.580444v115.541333a583.964444 583.964444 0 0 1-6.968889 93.297778h28.444445l34.133333 118.727111z m-98.474667 158.663111l-17.948444 24.405333a59.192889 59.192889 0 0 0-33.393778-13.169778 16.327111 16.327111 0 0 0-20.195556 14.791111c0 11.264 15.189333 15.36 31.146667 21.418667 20.451556 7.68 42.894222 17.806222 42.894222 46.336 0 26.88-21.191111 48.554667-61.098666 48.554667a97.223111 97.223111 0 0 1-58.595556-21.674667l18.488889-25.230222c11.377778 10.097778 25.884444 15.985778 41.102222 16.725333 15.473778 0 22.186667-6.599111 22.186667-16.213333 0-11.491556-15.928889-16.696889-31.886222-23.011556a52.053333 52.053333 0 0 1-42.126223-44.686222 50.005333 50.005333 0 0 1 57.088-47.160889 85.589333 85.589333 0 0 1 52.337778 19.057778v-0.142222z m-249.031111-338.631111h106.183111a14.791111 14.791111 0 0 1 12.970667 6.712888c3.356444 4.266667 4.039111 10.040889 1.735111 14.961778l-75.292444 127.658667 16.952888 30.151111h-64.568888L2796.234524 449.422222h64.568889l16.952889 31.004445 41.870222-66.986667h-104.96a14.961778 14.961778 0 0 1-12.231111-6.286222 14.421333 14.421333 0 0 1-3.214222-12.970667l10.979556-51.854222h-41.159111v-24.32h46.648888l15.928889-73.671111H2781.016747v-24.263111h55.836444l10.979556-49.379556h64.568889l-10.979556 49.379556h80.014222v24.263111h-84.992l-16.213333 73.671111h112.440889v24.32h-117.418667l-10.24 47.274667z m-131.896889 179.086222H2670.083413v-74.922667l-78.279111 5.859556v-23.836445l78.279111-5.888v-61.098666h-59.818666a15.644444 15.644444 0 0 1-11.946667-4.977778 16.241778 16.241778 0 0 1-3.527111-12.970667l19.968-152.32h-22.698667v-23.893333h25.685334l5.973333-43.776h59.079111l-5.717333 43.918222h90.225777v23.864889h-93.724444l-18.204444 137.671111a7.480889 7.480889 0 0 0 1.991111 5.888 7.082667 7.082667 0 0 0 5.973333 2.929778h10.24V278.812444h59.562667v106.439112h29.667555v23.836444h-29.667555v56.092444l34.161777-2.503111v23.864889l-34.133333 2.503111v79.900445-0.284445z m-98.702222 140.629333c6.229333-0.199111 12.430222 0.910222 18.204444 3.271111l-7.224888 34.901334a47.616 47.616 0 0 0-15.729778-2.474667 40.106667 40.106667 0 0 0-35.384889 30.151111v91.591111h-40.135111v-153.571555h32.910222l2.730667 27.164444h0.995555a53.788444 53.788444 0 0 1 43.633778-30.890667v-0.142222z m-149.589333-168.618667a27.875556 27.875556 0 0 1-27.904 27.591112h-99.214223v-23.836445h46.848a15.815111 15.815111 0 0 0 15.957334-15.928889V333.653333h-128.853334v-23.808h252.501334v23.808h-59.335111v207.189334-0.142223z m-182.215111-349.013333h230.115555v24.064h-230.115555v-24.064z m-64.056889 151.523556h18.944v225.564444h-64.853334V398.506667h-48.839111a818.346667 818.346667 0 0 0 43.377778-90.823111h-43.377778a664.974222 664.974222 0 0 0 57.344-136.448h64.824889c-6.741333 26.026667-15.502222 51.484444-26.168889 76.174222h32.881778a569.685333 569.685333 0 0 1-34.133333 95.914666v-0.085333zM2169.233636 866.702222h-40.391112v-90.794666c0-23.580444-6.485333-32.085333-21.674666-32.085334a44.430222 44.430222 0 0 0-32.142222 17.294222v105.585778h-39.907556v-153.6h32.910222l2.730667 20.309334h0.995555a70.997333 70.997333 0 0 1 49.863112-24.120889c33.166222 0 47.616 23.04 47.616 61.696v95.715555z m-123.648-451.640889h49.863111a451.982222 451.982222 0 0 1-34.133334 87.893334c9.955556 21.390222 20.679111 42.752 32.398223 64.056889h-68.835556a747.861333 747.861333 0 0 1-72.760889-179.086223h-21.191111v140.202667c0.483556 8.96 7.964444 15.928889 16.952889 15.872l19.427555 0.426667v23.836444h-75.52a29.383111 29.383111 0 0 1-30.663111-27.619555V210.204444a29.098667 29.098667 0 0 1 30.663111-27.619555h166.769778a29.098667 29.098667 0 0 1 30.663111 27.619555v150.272a29.383111 29.383111 0 0 1-30.663111 27.619556h-38.4c4.750222 18.830222 10.723556 37.205333 16.952889 55.608889 3.584-9.272889 6.428444-18.801778 8.476445-28.529778v-0.113778z m-43.861334-209.635555H1947.878969a16.554667 16.554667 0 0 0-16.952889 15.900444v54.840889h88.462222V222.208a17.578667 17.578667 0 0 0-17.664-16.611556v-0.170666z m17.692445 94.606222h-88.490667v64.426667h70.798222a16.896 16.896 0 0 0 17.692445-15.872v-48.554667zM1761.909191 866.702222H1689.603413v-202.979555h67.072c41.614222 0 73.528889 12.088889 73.528889 49.863111a46.108444 46.108444 0 0 1-27.676444 43.889778v1.706666c23.04 4.039111 39.424 24.661333 38.144 47.985778 0 40.760889-33.905778 59.733333-78.791111 59.733333v-0.199111z m-7.736889-172.003555h-23.921778v51.541333h23.409778c25.941333 0 37.148444-10.410667 37.148445-26.595556 0-17.578667-12.231111-24.746667-36.636445-24.746666v-0.199111z m4.238222 81.720889h-28.16v58.965333h28.16c27.676444 0 42.638222-9.984 42.638223-31.004445 0-19.512889-14.734222-27.733333-42.666667-27.733333v-0.227555z m-13.454222-215.864889a28.586667 28.586667 0 0 1-8.476444-19.939556v-89.543111h-37.148445v-23.864889h37.148445v-76.856889h-37.148445v-24.291555h138.097778v24.291555H1802.527858v76.999111h34.901333v23.893334H1802.527858v77.368889a16.184889 16.184889 0 0 0 16.469333 16.327111h18.432v23.836444h-72.277333a28.785778 28.785778 0 0 1-20.195556-7.992889v-0.227555z m17.436445-247.608889h-66.048c14.506667-46.307556 24.092444-93.980444 28.672-142.279111h65.536c-1.991111 19.456-4.977778 38.855111-8.476445 58.168889h55.352889v23.836444h-59.818667a696.32 696.32 0 0 1-15.217777 60.501333v-0.227555z m191.203555 455.480889a23.921778 23.921778 0 0 0-25.912889-26.624 86.442667 86.442667 0 0 0-42.382222 14.535111l-14.478222-26.595556a121.742222 121.742222 0 0 1 64.085333-20.280889c38.883556 0 59.079111 23.324444 59.079111 67.726223v89.742222h-32.910222l-2.986667-16.497778h-0.995555a72.021333 72.021333 0 0 1-46.364445 20.337778 43.52 43.52 0 0 1-45.368888-45.539556c0-32.967111 26.652444-50.232889 88.234666-56.803555z m-29.667555 70.741333a40.675556 40.675556 0 0 0 29.667555-15.075556v-31.004444c-37.376 4.977778-49.863111 15.075556-49.863111 28.785778a17.152 17.152 0 0 0 20.195556 17.294222z m326.087111-59.505778h1.223111l53.105778-66.360889h43.889777l-53.105777 62.776889 58.083555 90.794667h-43.633778l-37.376-63.630222-22.186666 25.230222v38.4h-39.139556v-218.88h39.139556v131.669333z m201.415111-107.52h33.649778v41.159111h37.888v31.800889h-37.888v67.982222a20.707556 20.707556 0 0 0 20.707555 25.799112c5.205333-0.227556 10.353778-1.336889 15.189334-3.299556l6.485333 29.383111c-10.325333 3.697778-21.191111 5.632-32.142222 5.745778-36.664889 0-50.631111-23.04-50.631111-57.6v-67.982222h-21.674667v-29.952l23.694222-1.905778 4.721778-41.130667z m302.876444 96.284445a23.921778 23.921778 0 0 0-25.912889-26.624 86.442667 86.442667 0 0 0-42.382222 14.535111l-14.449778-26.595556a121.742222 121.742222 0 0 1 64.056889-20.280889c38.883556 0 59.079111 23.324444 59.079111 67.726223v89.742222h-32.910222l-2.986666-16.497778h-0.995556a72.021333 72.021333 0 0 1-46.364444 20.337778 43.52 43.52 0 0 1-45.368889-45.539556c0-32.967111 26.424889-50.232889 88.234666-56.803555z m-29.667555 70.741333a40.675556 40.675556 0 0 0 29.667555-15.075556v-31.004444c-37.376 4.977778-49.834667 15.075556-49.834666 28.785778a17.152 17.152 0 0 0 20.195555 17.294222z m146.858666-105.585778h0.995556a70.997333 70.997333 0 0 1 49.834667-24.120889c33.166222 0 47.616 23.04 47.616 61.696v95.715556h-40.391111v-90.794667c0-23.580444-6.456889-32.056889-21.674667-32.056889a44.430222 44.430222 0 0 0-32.142222 17.265778v105.585778h-39.907556v-153.6h32.910222l2.759111 20.309333z m439.751112-24.120889c42.382222 0 64.284444 31.004444 64.284444 73.472 0.056889 6.200889-0.597333 12.373333-1.991111 18.375111h-94.72a40.334222 40.334222 0 0 0 42.638222 38.4 63.203556 63.203556 0 0 0 34.417778-10.695111l13.681778 24.689778a96.113778 96.113778 0 0 1-53.589334 17.009778 74.410667 74.410667 0 0 1-76.288-80.355556 75.207111 75.207111 0 0 1 71.537778-80.896z m29.639111 65.251556a28.757333 28.757333 0 0 0-29.155556-33.991111 34.56 34.56 0 0 0-33.393778 33.991111h62.577778z" fill="#4D4D4D" p-id="32913"></path></svg>
+              <svg t="1709003441012" class="icon" viewBox="0 0 3527 1024" version="1.1"
+                   xmlns="http://www.w3.org/2000/svg" p-id="32905" width="90" height="40">
+                <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>
+                <path
+                    d="M679.569636 1.763556H1120.515413c53.532444 0 29.383111 45.966222 16.782223 102.542222l-178.460445 807.452444c-12.515556 56.405333-8.618667 102.4-62.264889 102.4H455.626524c-53.617778 0-86.812444-45.994667-74.211555-102.4L559.903858 104.305778C572.59008 47.729778 626.037191 1.763556 679.569636 1.763556"
+                    fill="#004380" p-id="32907"></path>
+                <path
+                    d="M1106.748302 1.763556h388.096c54.243556 0 87.921778 45.966222 75.178667 102.542222l-180.622222 807.452444c-12.771556 56.405333-67.043556 102.4-121.287111 102.4H880.245191c-54.272 0-87.921778-45.994667-75.235555-102.4L985.688747 104.305778C998.31808 47.729778 1052.504747 1.763556 1106.776747 1.763556"
+                    fill="#007A8A" p-id="32908"></path>
+                <path
+                    d="M1135.192747 604.416l-42.410667 173.568h11.434667l-8.874667 35.84h-11.320889l-2.673778 11.064889h-40.391111l2.759111-11.064889h-81.92l8.192-33.166222h8.334223l42.979555-176.241778 8.590222-35.527111h41.130667l-4.323556 17.92s10.979556-9.756444 21.361778-13.084445c10.382222-3.413333 70.001778-4.636444 70.001778-4.636444l-8.817778 35.328h-14.051555z m-72.533334 0l-10.894222 44.373333s12.231111-6.855111 18.858667-9.102222c6.741333-2.218667 16.839111-2.958222 16.839111-2.958222l7.879111-32.312889H1062.687858z m-16.327111 66.304l-11.264 46.193778s12.515556-7.879111 19.143111-10.382222a188.586667 188.586667 0 0 1 17.038223-3.470223l7.964444-32.341333h-32.881778z m-26.168889 107.690667h32.768l9.386667-38.968889H1029.692302l-9.500444 38.968889zM1186.108302 568.888889h40.704l0.398222 19.541333c-0.284444 3.328 1.934222 4.864 6.684445 4.864h8.277333l-7.566222 32.284445h-21.987556c-19.000889 1.763556-26.225778-8.789333-25.742222-20.650667L1186.108302 568.888889z"
+                    fill="#FEFEFE" p-id="32909"></path>
+                <path
+                    d="M1174.844302 721.635556h-46.08l7.907556-31.516445h52.650666l7.480889-28.814222h-51.968L1153.71008 625.777778h144.583111l-8.988444 35.555555H1240.75008l-7.566222 28.785778h48.64l-8.106667 31.516445h-52.508444l-9.386667 13.255111h21.333333l5.233778 39.708444c0.568889 3.953778 0.568889 6.542222 1.678222 8.248889 1.080889 1.393778 7.480889 2.133333 11.207111 2.133333h6.456889l-9.841777 38.599111h-16.440889c-2.503111 0-6.286222-0.199111-11.52-0.455111-4.892444-0.540444-8.362667-3.982222-11.690667-5.973333a18.403556 18.403556 0 0 1-8.590222-13.425778l-5.12-39.623111-23.950222 38.997333c-7.566222 12.373333-17.834667 21.788444-35.185778 21.788445h-33.422222l8.760888-34.503111h12.8c3.697778 0 6.912-1.706667 9.329778-3.214222a15.189333 15.189333 0 0 0 7.082667-7.025778l34.872889-58.510222zM677.635413 625.777778H793.603413l-8.590222 36.380444h-46.336l-7.224889 31.061334h47.416889l-8.675555 37.546666h-47.36l-11.52 50.517334c-1.393778 5.546667 11.264 6.257778 15.843555 6.257777l23.665778-4.266666L741.29408 824.888889h-53.418667c-4.323556 0-7.509333-0.824889-12.145777-2.190222-4.494222-1.507556-6.485333-4.152889-8.476445-8.135111-1.934222-4.124444-4.977778-7.480889-2.901333-16.327112l15.36-66.816h-26.339556l8.760889-38.200888h26.396445l7.025777-31.061334h-26.311111L677.635413 625.777778zM770.648747 583.822222h50.972444l-9.244444 27.363556h-69.632l-7.537778 5.745778c-3.242667 2.787556-4.352 1.649778-8.590222 3.640888a55.779556 55.779556 0 0 1-22.897778 5.205334h-22.300445l8.988445-26.282667h6.712889c5.632 0 9.528889-0.455111 11.491555-1.536 2.218667-1.28 4.721778-4.039111 7.452445-8.533333l12.885333-20.536889h50.602667l-8.903111 14.933333zM837.606969 569.088h48.355555l-7.082666 24.120889s15.303111-12.117333 25.998222-16.469333c10.638222-3.868444 34.730667-7.395556 34.730667-7.395556L1017.887858 568.888889l-26.652445 87.950222c-4.522667 15.018667-9.756444 24.746667-13.027555 29.212445a33.792 33.792 0 0 1-13.198222 12.032 49.806222 49.806222 0 0 1-18.119112 6.058666c-5.176889 0.369778-13.084444 0.483556-24.092444 0.654222H847.363413l-21.191111 69.461334c-2.019556 6.940444-2.986667 10.24-1.649778 12.117333a8.732444 8.732444 0 0 0 7.168 3.470222l33.28-3.100444L853.564302 824.888889h-37.148444c-11.861333 0-20.48-0.284444-26.510222-0.739556-5.745778-0.483556-11.719111 0-15.786667-3.015111-3.413333-3.043556-8.704-7.054222-8.590222-11.093333 0.369778-3.754667 1.991111-10.040889 4.380444-18.659556l67.697778-222.293333z m102.684444 88.746667H861.016747l-4.892445 15.815111h68.608c8.078222-0.938667 9.756444 0.199111 10.467556-0.170667l5.034666-15.644444z m-74.951111-14.279111s15.502222-14.023111 42.040889-18.545778c6.030222-1.137778 43.662222-0.739556 43.662222-0.739556l5.745778-18.830222H876.945636l-11.576889 38.115556z"
+                    fill="#FEFEFE" p-id="32910"></path>
+                <path
+                    d="M961.795413 711.111111l-4.494222 21.219556c-1.877333 6.656-3.555556 11.576889-8.561778 15.872-5.290667 4.465778-11.491556 9.159111-25.969777 9.159111l-26.823112 1.137778-0.199111 23.950222c-0.284444 6.741333 1.536 6.087111 2.588445 7.168 1.251556 1.223111 2.360889 1.678222 3.498666 2.161778l8.533334-0.483556 25.571555-1.422222L925.301191 824.888889h-29.383111c-20.536889 0-35.811556-0.483556-40.760889-4.408889-4.949333-3.128889-5.603556-7.025778-5.518222-13.767111l1.877333-93.496889h46.876445l-0.654223 19.114667h11.264c3.868444 0 6.485333-0.369778 8.078223-1.422223a8.448 8.448 0 0 0 3.128889-4.835555l4.721777-14.961778h36.835556zM368.529636 256c-1.564444 7.509333-30.976 142.933333-31.061334 143.075556-6.314667 27.392-10.922667 46.933333-26.567111 59.534222a47.388444 47.388444 0 0 1-31.288889 10.894222c-19.285333 0-30.549333-9.585778-32.426666-27.761778l-0.398223-6.257778s5.888-36.693333 5.888-36.892444c0 0 30.862222-123.448889 36.408889-139.776 0.284444-0.910222 0.341333-1.422222 0.426667-1.848889-60.046222 0.540444-70.712889 0-71.424-0.967111-0.398222 1.336889-1.905778 8.988444-1.905778 8.988444l-31.516444 139.093334-2.673778 11.832889-5.262222 38.599111c0 11.434667 2.275556 20.764444 6.741333 28.672C197.834524 508.245333 238.76608 512 261.919858 512c29.866667 0 57.856-6.314667 76.771555-17.891556 32.824889-19.370667 41.415111-49.664 49.095111-76.600888l3.527112-13.795556s31.800889-128.199111 37.205333-144.896c0.199111-0.910222 0.284444-1.422222 0.568889-1.848889-43.576889 0.455111-56.433778 0-60.558222-0.967111M548.042524 482.645333a453.518222 453.518222 0 0 0-45.397333 0.910223l-0.796444-1.763556c1.820444-8.846222 3.811556-17.521778 5.603555-26.453333l2.588445-12.060445c3.896889-18.716444 7.68-40.476444 8.106666-47.160889 0.426667-3.982222 1.706667-13.937778-8.732444-13.937777-4.352 0-8.903111 2.304-13.539556 4.693333-2.56 9.955556-7.651556 37.973333-10.097777 50.716444-5.205333 26.88-5.546667 29.980444-7.879112 43.264l-1.507555 1.792c-18.545778-0.341333-25.031111-0.341333-46.364445 0.910223l-0.938666-2.019556c3.527111-15.928889 7.111111-32.056889 10.496-48.042667 8.96-43.349333 11.093333-59.904 13.539555-81.948444l1.706667-1.28c20.849778-3.242667 25.884444-3.896889 48.440889-8.931556l1.905778 2.332445-3.470223 13.795555c3.84-2.503111 7.480889-5.034667 11.320889-7.196444 10.638222-5.745778 22.471111-7.452444 28.956445-7.452445 9.927111 0 20.736 3.015111 25.230222 15.587556 4.266667 11.207111 1.422222 24.974222-4.181333 52.110222l-2.901334 13.880889a1275.761778 1275.761778 0 0 0-9.955555 56.462222l-2.133334 1.792zM607.206969 482.645333c-8.362667-0.085333-13.767111-0.341333-18.972445-0.085333-5.205333 0.085333-10.296889 0.455111-18.062222 0.995556l-0.398222-0.995556-0.512-1.052444c2.133333-11.605333 3.271111-15.616 4.323556-19.740445 1.080889-4.152889 2.048-8.248889 3.925333-20.024889 2.446222-15.36 3.953778-26.083556 4.920889-35.498666 1.137778-9.102222 1.735111-16.867556 2.616889-25.827556l0.568889-0.682667 0.682666-0.881777c8.305778-1.678222 13.568-2.816 18.972445-4.067556 5.461333-1.024 10.922667-2.616889 19.512889-5.006222l0.312888 1.052444 0.256 1.137778c-1.592889 9.500444-3.242667 19.000889-4.807111 28.643556-1.507556 9.671111-3.128889 19.143111-4.608 28.643555-3.100444 20.195556-4.352 27.761778-5.091555 33.223111-0.711111 5.091556-0.910222 7.907556-2.104889 18.346667l-0.796445 0.938667-0.739555 0.853333zM790.474524 412.216889c6.684444-30.492444 1.450667-44.743111-5.12-53.418667-9.955556-13.226667-27.562667-17.464889-45.795555-17.464889-10.979556 0-37.148444 1.137778-57.571556 20.650667-14.677333 14.108444-21.447111 33.223111-25.543111 51.541333-4.124444 18.688-8.874667 52.309333 20.935111 64.796445 9.216 4.096 22.471111 5.233778 31.004445 5.233778 21.845333 0 44.259556-6.257778 61.098666-24.746667 12.970667-15.047111 18.887111-37.376 20.963556-46.592m-50.119111-2.190222c-0.967111 5.176889-5.319111 24.291556-11.178667 32.426666-4.096 6.030222-8.931556 9.671111-14.307555 9.671111-1.592889 0-11.093333 0-11.235556-14.620444-0.056889-7.224889 1.336889-14.592 3.100445-22.584889 5.034667-23.096889 10.951111-42.496 26.140444-42.496 11.889778 0 12.743111 14.449778 7.480889 37.603556M1249.653191 482.787556c-15.644444-0.170667-20.138667-0.170667-34.616889 0.768l-0.881778-1.820445c3.896889-23.011556 7.822222-45.937778 11.320889-69.205333 4.551111-30.179556 5.575111-43.008 7.054223-60.672l1.166222-1.479111c15.559111-3.413333 19.911111-4.408889 36.067555-9.045334l0.455111 2.076445c-2.958222 19.000889-5.859556 37.859556-8.760888 56.917333-5.944889 39.793778-8.106667 59.989333-10.382223 80.782222l-1.422222 1.706667z"
+                    fill="#FEFEFE" p-id="32911"></path>
+                <path
+                    d="M1231.078969 400.497778c-5.916444-15.644444-2.275556-47.217778-26.140445-57.827556-9.187556-4.181333-30.72 1.194667-49.265777 20.650667-13.056 13.880889-19.313778 32.938667-22.840889 51.2-3.754667 18.403556-8.049778 51.996444 18.631111 64 8.504889 4.152889 16.128 5.404444 23.893333 4.949333 26.794667-1.649778 47.217778-48.384 62.378667-66.844444 11.662222-14.620444-2.816-6.144-6.656-16.128z m-18.887111 10.439111c-1.052444 4.949333-5.006222 24.234667-10.268445 32.312889-3.527111 5.745778-11.889778 9.301333-16.725333 9.301333-1.365333 0-9.784889 0-10.097778-14.336-0.056889-7.139556 1.223111-14.506667 2.816-22.584889 4.579556-22.670222 9.870222-41.870222 23.552-41.870222 10.723556 0 15.303111 13.966222 10.723556 37.176889M912.472747 482.645333a452.408889 452.408889 0 0 0-45.368889 0.910223l-0.796445-1.763556c1.820444-8.846222 3.868444-17.521778 5.745778-26.453333l2.446222-12.060445c3.982222-18.716444 7.736889-40.476444 8.135111-47.160889 0.398222-3.982222 1.649778-13.937778-8.675555-13.937777-4.494222 0-8.988444 2.304-13.653333 4.693333-2.446222 9.955556-7.68 37.973333-10.183112 50.716444-5.063111 26.88-5.404444 29.980444-7.708444 43.264l-1.592889 1.792a469.788444 469.788444 0 0 0-46.307555 0.910223l-0.938667-2.019556c3.555556-15.928889 7.111111-32.056889 10.524444-48.042667 8.931556-43.349333 11.008-59.904 13.511111-81.948444l1.592889-1.28c20.821333-3.242667 25.969778-3.896889 48.526223-8.931556l1.706666 2.332445-3.214222 13.795555c3.697778-2.503111 7.509333-5.034667 11.292444-7.196444 10.552889-5.745778 22.471111-7.452444 28.956445-7.452445 9.784889 0 20.650667 3.015111 25.315555 15.587556 4.181333 11.207111 1.308444 24.974222-4.352 52.110222l-2.844444 13.880889a992.568889 992.568889 0 0 0-9.955556 56.462222l-2.161777 1.792zM1102.538524 335.815111c-3.043556 16.952889-12.032 31.175111-23.580444 38.087111-9.500444 5.831111-21.134222 6.314667-33.137778 6.314667h-7.765333l0.568889-3.811556 14.250666-75.918222 0.455112-3.896889 0.199111-2.986666 5.717333 0.739555 30.208 3.157333c11.662222 5.518222 16.440889 19.740444 13.084444 38.314667m-18.773333-79.445333l-14.478222 0.142222c-37.546667 0.568889-52.622222 0.426667-58.794667-0.512l-1.507555 9.301333-13.454223 76.458667-33.735111 169.955556c32.796444-0.483556 46.250667-0.483556 51.911111 0.284444 1.28-7.651556 8.874667-52.992 8.96-52.992 0 0 6.456889-33.251556 6.855112-34.474667 0 0 2.048-3.470222 4.067555-4.835555h3.015111c28.273778 0 60.216889 0 85.248-22.528 17.038222-15.473778 28.672-38.286222 33.848889-66.048 1.393778-6.798222 2.360889-14.876444 2.360889-22.983111 0-10.638222-1.735111-21.134222-6.769778-29.354667-12.771556-21.845333-38.200889-22.272-67.527111-22.414222M1438.438969 315.022222L1436.447858 312.888889c-25.429333 4.835556-30.037333 5.603556-53.447111 8.561778l-1.706667 1.621333c-0.085333 0.256-0.142222 0.654222-0.284444 1.024l-0.056889-0.369778c-17.436444 37.660444-16.924444 29.525333-31.089778 59.164445-0.085333-1.336889-0.085333-2.161778-0.142222-3.612445l-3.555556-64.284444-2.247111-2.104889c-26.652444 4.835556-27.306667 5.603556-51.911111 8.561778l-1.905778 1.621333c-0.284444 0.768-0.284444 1.592889-0.426667 2.531556l0.142223 0.312888c3.072 14.762667 2.332444 11.463111 5.404444 34.730667 1.479111 11.434667 3.384889 22.926222 4.835556 34.190222 2.417778 18.887111 3.783111 28.16 6.741333 57.002667-16.64 25.713778-20.565333 35.470222-36.579556 58.026667l1.024 2.133333c24.007111-0.853333 29.582222-0.853333 47.388445-0.853333l3.868444-4.124445c13.454222-27.192889 115.939556-192 115.939556-192M615.398969 363.832889c11.832889-6.4 13.312-15.217778 3.384889-19.797333-10.069333-4.636444-27.733333-3.128889-39.623111 3.242666-11.861333 6.257778-13.226667 15.160889-3.185778 19.854222 9.898667 4.494222 27.648 3.157333 39.424-3.299555M1298.264747 568.888889l-12.686223 35.555555c-3.982222 12.174222-11.434667 21.248-23.239111 21.333334l-20.167111-0.568889 5.888-32h3.953778c2.048 0 3.527111-0.170667 4.664889-1.109333 1.024-0.568889 1.763556-1.877333 2.588444-3.84l7.480889-19.370667h31.516445z"
+                    fill="#FEFEFE" p-id="32912"></path>
+                <path
+                    d="M3499.95008 747.576889c-5.148444-1.706667-10.524444-2.56-15.957333-2.503111a40.334222 40.334222 0 0 0-35.413334 30.151111v91.619555h-39.879111v-153.6h32.910222l2.730667 27.164445h0.995556a53.134222 53.134222 0 0 1 43.633777-31.004445c6.257778-0.170667 12.430222 0.938667 18.204445 3.328l-7.224889 34.844445z m-59.591111-179.114667h-63.800889a1286.144 1286.144 0 0 1-42.666667-204.231111h-14.193777v164.067556a16.184889 16.184889 0 0 0 15.957333 16.298666h17.720889v23.438223h-69.319111a27.676444 27.676444 0 0 1-28.16-27.619556v-176.184889h-27.676445v-23.836444h27.676445v-169.528889h63.800889v169.528889h121.656888v23.893333h-43.121777a1378.104889 1378.104889 0 0 0 42.126222 204.174222z m-104.675556-243.2a742.542222 742.542222 0 0 0 35.640889-143.530666h63.317334a835.811556 835.811556 0 0 1-34.673778 143.530666h-64.284445z m-106.467555 353.991111a50.062222 50.062222 0 0 0-16.213334-3.271111c-11.946667 0-18.688 7.111111-18.688 24.149334v13.169777h28.928v31.800889H3194.314524v121.770667h-40.135111v-121.742222h-20.679111v-29.952l20.679111-1.621334v-12.629333a49.863111 49.863111 0 0 1 53.361778-56.775111c9.955556 0 19.854222 1.848889 29.155556 5.461333l-7.480889 29.639111z m-59.335111-461.169777a12.458667 12.458667 0 0 0-13.454223-11.690667h-54.613333a11.946667 11.946667 0 0 0-12.686222 11.662222v217.656889h-49.379556v-225.564444a28.956444 28.956444 0 0 1 30.435556-28.046223h117.902222a29.098667 29.098667 0 0 1 30.919111 28.046223v225.564444h-49.123555V218.083556z m42.638222 351.488h-54.840889l-19.456-68.209778c-8.078222 23.893333-18.858667 46.791111-32.142222 68.209778h-62.577778a323.271111 323.271111 0 0 0 57.827556-195.413334V241.976889h55.580444v115.541333a583.964444 583.964444 0 0 1-6.968889 93.297778h28.444445l34.133333 118.727111z m-98.474667 158.663111l-17.948444 24.405333a59.192889 59.192889 0 0 0-33.393778-13.169778 16.327111 16.327111 0 0 0-20.195556 14.791111c0 11.264 15.189333 15.36 31.146667 21.418667 20.451556 7.68 42.894222 17.806222 42.894222 46.336 0 26.88-21.191111 48.554667-61.098666 48.554667a97.223111 97.223111 0 0 1-58.595556-21.674667l18.488889-25.230222c11.377778 10.097778 25.884444 15.985778 41.102222 16.725333 15.473778 0 22.186667-6.599111 22.186667-16.213333 0-11.491556-15.928889-16.696889-31.886222-23.011556a52.053333 52.053333 0 0 1-42.126223-44.686222 50.005333 50.005333 0 0 1 57.088-47.160889 85.589333 85.589333 0 0 1 52.337778 19.057778v-0.142222z m-249.031111-338.631111h106.183111a14.791111 14.791111 0 0 1 12.970667 6.712888c3.356444 4.266667 4.039111 10.040889 1.735111 14.961778l-75.292444 127.658667 16.952888 30.151111h-64.568888L2796.234524 449.422222h64.568889l16.952889 31.004445 41.870222-66.986667h-104.96a14.961778 14.961778 0 0 1-12.231111-6.286222 14.421333 14.421333 0 0 1-3.214222-12.970667l10.979556-51.854222h-41.159111v-24.32h46.648888l15.928889-73.671111H2781.016747v-24.263111h55.836444l10.979556-49.379556h64.568889l-10.979556 49.379556h80.014222v24.263111h-84.992l-16.213333 73.671111h112.440889v24.32h-117.418667l-10.24 47.274667z m-131.896889 179.086222H2670.083413v-74.922667l-78.279111 5.859556v-23.836445l78.279111-5.888v-61.098666h-59.818666a15.644444 15.644444 0 0 1-11.946667-4.977778 16.241778 16.241778 0 0 1-3.527111-12.970667l19.968-152.32h-22.698667v-23.893333h25.685334l5.973333-43.776h59.079111l-5.717333 43.918222h90.225777v23.864889h-93.724444l-18.204444 137.671111a7.480889 7.480889 0 0 0 1.991111 5.888 7.082667 7.082667 0 0 0 5.973333 2.929778h10.24V278.812444h59.562667v106.439112h29.667555v23.836444h-29.667555v56.092444l34.161777-2.503111v23.864889l-34.133333 2.503111v79.900445-0.284445z m-98.702222 140.629333c6.229333-0.199111 12.430222 0.910222 18.204444 3.271111l-7.224888 34.901334a47.616 47.616 0 0 0-15.729778-2.474667 40.106667 40.106667 0 0 0-35.384889 30.151111v91.591111h-40.135111v-153.571555h32.910222l2.730667 27.164444h0.995555a53.788444 53.788444 0 0 1 43.633778-30.890667v-0.142222z m-149.589333-168.618667a27.875556 27.875556 0 0 1-27.904 27.591112h-99.214223v-23.836445h46.848a15.815111 15.815111 0 0 0 15.957334-15.928889V333.653333h-128.853334v-23.808h252.501334v23.808h-59.335111v207.189334-0.142223z m-182.215111-349.013333h230.115555v24.064h-230.115555v-24.064z m-64.056889 151.523556h18.944v225.564444h-64.853334V398.506667h-48.839111a818.346667 818.346667 0 0 0 43.377778-90.823111h-43.377778a664.974222 664.974222 0 0 0 57.344-136.448h64.824889c-6.741333 26.026667-15.502222 51.484444-26.168889 76.174222h32.881778a569.685333 569.685333 0 0 1-34.133333 95.914666v-0.085333zM2169.233636 866.702222h-40.391112v-90.794666c0-23.580444-6.485333-32.085333-21.674666-32.085334a44.430222 44.430222 0 0 0-32.142222 17.294222v105.585778h-39.907556v-153.6h32.910222l2.730667 20.309334h0.995555a70.997333 70.997333 0 0 1 49.863112-24.120889c33.166222 0 47.616 23.04 47.616 61.696v95.715555z m-123.648-451.640889h49.863111a451.982222 451.982222 0 0 1-34.133334 87.893334c9.955556 21.390222 20.679111 42.752 32.398223 64.056889h-68.835556a747.861333 747.861333 0 0 1-72.760889-179.086223h-21.191111v140.202667c0.483556 8.96 7.964444 15.928889 16.952889 15.872l19.427555 0.426667v23.836444h-75.52a29.383111 29.383111 0 0 1-30.663111-27.619555V210.204444a29.098667 29.098667 0 0 1 30.663111-27.619555h166.769778a29.098667 29.098667 0 0 1 30.663111 27.619555v150.272a29.383111 29.383111 0 0 1-30.663111 27.619556h-38.4c4.750222 18.830222 10.723556 37.205333 16.952889 55.608889 3.584-9.272889 6.428444-18.801778 8.476445-28.529778v-0.113778z m-43.861334-209.635555H1947.878969a16.554667 16.554667 0 0 0-16.952889 15.900444v54.840889h88.462222V222.208a17.578667 17.578667 0 0 0-17.664-16.611556v-0.170666z m17.692445 94.606222h-88.490667v64.426667h70.798222a16.896 16.896 0 0 0 17.692445-15.872v-48.554667zM1761.909191 866.702222H1689.603413v-202.979555h67.072c41.614222 0 73.528889 12.088889 73.528889 49.863111a46.108444 46.108444 0 0 1-27.676444 43.889778v1.706666c23.04 4.039111 39.424 24.661333 38.144 47.985778 0 40.760889-33.905778 59.733333-78.791111 59.733333v-0.199111z m-7.736889-172.003555h-23.921778v51.541333h23.409778c25.941333 0 37.148444-10.410667 37.148445-26.595556 0-17.578667-12.231111-24.746667-36.636445-24.746666v-0.199111z m4.238222 81.720889h-28.16v58.965333h28.16c27.676444 0 42.638222-9.984 42.638223-31.004445 0-19.512889-14.734222-27.733333-42.666667-27.733333v-0.227555z m-13.454222-215.864889a28.586667 28.586667 0 0 1-8.476444-19.939556v-89.543111h-37.148445v-23.864889h37.148445v-76.856889h-37.148445v-24.291555h138.097778v24.291555H1802.527858v76.999111h34.901333v23.893334H1802.527858v77.368889a16.184889 16.184889 0 0 0 16.469333 16.327111h18.432v23.836444h-72.277333a28.785778 28.785778 0 0 1-20.195556-7.992889v-0.227555z m17.436445-247.608889h-66.048c14.506667-46.307556 24.092444-93.980444 28.672-142.279111h65.536c-1.991111 19.456-4.977778 38.855111-8.476445 58.168889h55.352889v23.836444h-59.818667a696.32 696.32 0 0 1-15.217777 60.501333v-0.227555z m191.203555 455.480889a23.921778 23.921778 0 0 0-25.912889-26.624 86.442667 86.442667 0 0 0-42.382222 14.535111l-14.478222-26.595556a121.742222 121.742222 0 0 1 64.085333-20.280889c38.883556 0 59.079111 23.324444 59.079111 67.726223v89.742222h-32.910222l-2.986667-16.497778h-0.995555a72.021333 72.021333 0 0 1-46.364445 20.337778 43.52 43.52 0 0 1-45.368888-45.539556c0-32.967111 26.652444-50.232889 88.234666-56.803555z m-29.667555 70.741333a40.675556 40.675556 0 0 0 29.667555-15.075556v-31.004444c-37.376 4.977778-49.863111 15.075556-49.863111 28.785778a17.152 17.152 0 0 0 20.195556 17.294222z m326.087111-59.505778h1.223111l53.105778-66.360889h43.889777l-53.105777 62.776889 58.083555 90.794667h-43.633778l-37.376-63.630222-22.186666 25.230222v38.4h-39.139556v-218.88h39.139556v131.669333z m201.415111-107.52h33.649778v41.159111h37.888v31.800889h-37.888v67.982222a20.707556 20.707556 0 0 0 20.707555 25.799112c5.205333-0.227556 10.353778-1.336889 15.189334-3.299556l6.485333 29.383111c-10.325333 3.697778-21.191111 5.632-32.142222 5.745778-36.664889 0-50.631111-23.04-50.631111-57.6v-67.982222h-21.674667v-29.952l23.694222-1.905778 4.721778-41.130667z m302.876444 96.284445a23.921778 23.921778 0 0 0-25.912889-26.624 86.442667 86.442667 0 0 0-42.382222 14.535111l-14.449778-26.595556a121.742222 121.742222 0 0 1 64.056889-20.280889c38.883556 0 59.079111 23.324444 59.079111 67.726223v89.742222h-32.910222l-2.986666-16.497778h-0.995556a72.021333 72.021333 0 0 1-46.364444 20.337778 43.52 43.52 0 0 1-45.368889-45.539556c0-32.967111 26.424889-50.232889 88.234666-56.803555z m-29.667555 70.741333a40.675556 40.675556 0 0 0 29.667555-15.075556v-31.004444c-37.376 4.977778-49.834667 15.075556-49.834666 28.785778a17.152 17.152 0 0 0 20.195555 17.294222z m146.858666-105.585778h0.995556a70.997333 70.997333 0 0 1 49.834667-24.120889c33.166222 0 47.616 23.04 47.616 61.696v95.715556h-40.391111v-90.794667c0-23.580444-6.456889-32.056889-21.674667-32.056889a44.430222 44.430222 0 0 0-32.142222 17.265778v105.585778h-39.907556v-153.6h32.910222l2.759111 20.309333z m439.751112-24.120889c42.382222 0 64.284444 31.004444 64.284444 73.472 0.056889 6.200889-0.597333 12.373333-1.991111 18.375111h-94.72a40.334222 40.334222 0 0 0 42.638222 38.4 63.203556 63.203556 0 0 0 34.417778-10.695111l13.681778 24.689778a96.113778 96.113778 0 0 1-53.589334 17.009778 74.410667 74.410667 0 0 1-76.288-80.355556 75.207111 75.207111 0 0 1 71.537778-80.896z m29.639111 65.251556a28.757333 28.757333 0 0 0-29.155556-33.991111 34.56 34.56 0 0 0-33.393778 33.991111h62.577778z"
+                    fill="#4D4D4D" p-id="32913"></path>
+              </svg>
             </el-radio>
             </el-radio>
             <el-radio label="4" border>
             <el-radio label="4" border>
-              <svg t="1709002828937" class="icon" viewBox="0 0 4220 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="22654" width="94" height="40"><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><path d="M1594.84684 229.409369h-232.537678c-15.641548 0-29.197556 11.470468-32.325866 27.112016l-93.849287 595.421589c-2.08554 11.470468 7.299389 21.898167 18.769857 21.898167h110.533605c15.641548 0 29.197556-11.470468 32.325866-27.112017l25.026476-160.586558c2.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.641548c41.710794 0 81.336049 0 102.191446 23.983707 12.513238 14.598778 15.641548 35.454175 11.470468 64.651731zM2288.288795 443.177189h-111.576375c-9.384929 0-17.727088 7.299389-18.769857 16.684318l-5.213849 31.283096-7.299389-11.470469c-23.983707-34.411405-77.164969-46.924644-131.389002-46.924643-123.046843 0-227.323829 92.806517-248.179226 223.152749-10.427699 64.651731 4.171079 127.217923 41.710794 171.014257 34.411405 39.625255 82.378819 56.309572 139.731161 56.309572 99.063136 0 153.287169-63.608961 153.287169-63.608961l-5.21385 31.283096c-2.08554 11.470468 7.299389 21.898167 18.769858 21.898167h100.105906c15.641548 0 29.197556-11.470468 32.325866-27.112017l60.480652-380.610998c2.08554-10.427699-6.256619-21.898167-18.769858-21.898167z m-154.329939 216.896131c-10.427699 63.608961-61.523422 106.362525-125.132383 106.362525-32.325866 0-58.395112-10.427699-75.079429-30.240326-16.684318-19.812627-22.940937-46.924644-17.727088-78.207739 10.427699-62.566191 61.523422-107.405295 124.089613-107.405295 31.283096 0 57.352342 10.427699 74.03666 30.240326 17.727088 20.855397 25.026477 47.967413 19.812627 79.250509z" fill="#003087" p-id="22656"></path><path d="M3943.164559 443.177189h-111.576375c-9.384929 0-17.727088 7.299389-18.769857 16.684318l-5.21385 31.283096-7.299389-11.470469c-23.983707-34.411405-77.164969-46.924644-131.389002-46.924643-123.046843 0-227.323829 92.806517-248.179226 223.152749-10.427699 64.651731 4.171079 127.217923 41.710795 171.014257 34.411405 39.625255 82.378819 56.309572 139.73116 56.309572 99.063136 0 153.287169-63.608961 153.28717-63.608961l-5.21385 31.283096c-2.08554 11.470468 7.299389 21.898167 18.769858 21.898167h100.105906c15.641548 0 29.197556-11.470468 32.325866-27.112017l60.480651-380.610998c2.08554-10.427699-6.256619-21.898167-18.769857-21.898167z m-154.329939 216.896131c-10.427699 63.608961-61.523422 106.362525-125.132383 106.362525-32.325866 0-58.395112-10.427699-75.07943-30.240326-16.684318-19.812627-22.940937-46.924644-17.727087-78.207739 10.427699-62.566191 61.523422-107.405295 124.089613-107.405295 31.283096 0 57.352342 10.427699 74.03666 30.240326 17.727088 20.855397 25.026477 47.967413 19.812627 79.250509z" fill="#009CDE" p-id="22657"></path><path d="M2880.582074 443.177189h-111.576375c-10.427699 0-20.855397 5.213849-27.112016 14.598778l-154.329939 227.323829-65.694501-217.9389c-4.171079-13.556008-16.684318-22.940937-31.283096-22.940937h-109.490835c-13.556008 0-22.940937 13.556008-18.769857 26.069247l123.046843 360.79837-115.747454 162.672098c-9.384929 12.513238 0 30.240326 15.641548 30.240326h111.576375c10.427699 0 20.855397-5.213849 26.069246-13.556008l371.226069-535.983707c11.470468-13.556008 2.08554-31.283096-13.556008-31.283096z" fill="#003087" p-id="22658"></path><path d="M4074.553561 245.050916l-94.892057 605.849288c-2.08554 11.470468 7.299389 21.898167 18.769857 21.898167h95.934827c15.641548 0 29.197556-11.470468 32.325866-27.112017l93.849287-595.421588c2.08554-11.470468-7.299389-21.898167-18.769857-21.898167h-107.405296c-10.427699 1.04277-18.769857 7.299389-19.812627 16.684317z" fill="#009CDE" p-id="22659"></path><path d="M782.529121 259.649695c12.513238-79.250509 0-133.474542-42.753564-182.484726C691.808143 22.940937 606.301015 0 496.81018 0H178.765374c-21.898167 0-41.710794 16.684318-44.839104 38.582485L0.451728 879.05499c-3.12831 16.684318 10.427699 31.283096 27.112016 31.283096h196.040733l-13.556008 85.507128c-2.08554 14.598778 9.384929 27.112016 23.983707 27.112016h165.800407c19.812627 0 36.496945-14.598778 39.625255-33.368635l2.08554-8.342159 31.283095-198.126273 2.08554-10.427699c3.12831-19.812627 19.812627-33.368635 39.625255-33.368635h25.026476c160.586558 0 285.718941-64.651731 322.215886-253.393075 15.641548-79.250509 7.299389-144.94501-33.368635-190.826884-12.513238-13.556008-28.154786-26.069246-45.881874-35.454175" fill="#009CDE" p-id="22660"></path><path d="M782.529121 259.649695c12.513238-79.250509 0-133.474542-42.753564-182.484726C691.808143 22.940937 606.301015 0 496.81018 0H178.765374c-21.898167 0-41.710794 16.684318-44.839104 38.582485L0.451728 879.05499c-3.12831 16.684318 10.427699 31.283096 27.112016 31.283096h196.040733l49.010184-312.830958-1.04277 9.384929c3.12831-21.898167 21.898167-38.582485 44.839104-38.582485h93.849287c183.527495 0 327.429735-74.03666 369.140529-289.89002l3.12831-18.769857" fill="#012169" p-id="22661"></path><path d="M326.838693 260.692464c2.08554-13.556008 10.427699-23.983707 21.898167-30.240326 5.213849-2.08554 11.470468-4.171079 16.684318-4.171079h250.264766c29.197556 0 57.352342 2.08554 82.378819 6.256619 7.299389 1.04277 14.598778 2.08554 20.855397 4.17108 7.299389 1.04277 13.556008 3.12831 19.812627 5.213849l9.384929 3.128309c12.513238 4.171079 23.983707 9.384929 34.411405 14.598779 12.513238-79.250509 0-133.474542-42.753564-182.484726C691.808143 22.940937 606.301015 0 496.81018 0H178.765374c-21.898167 0-41.710794 16.684318-44.839104 38.582485L0.451728 879.05499c-3.12831 16.684318 10.427699 31.283096 27.112016 31.283096h196.040733l49.010184-312.830958L326.838693 260.692464z" fill="#003087" p-id="22662"></path></svg>
+              <svg t="1709002828937" class="icon" viewBox="0 0 4220 1024" version="1.1"
+                   xmlns="http://www.w3.org/2000/svg" p-id="22654" width="94" height="40">
+                <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>
+                <path
+                    d="M1594.84684 229.409369h-232.537678c-15.641548 0-29.197556 11.470468-32.325866 27.112016l-93.849287 595.421589c-2.08554 11.470468 7.299389 21.898167 18.769857 21.898167h110.533605c15.641548 0 29.197556-11.470468 32.325866-27.112017l25.026476-160.586558c2.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.641548c41.710794 0 81.336049 0 102.191446 23.983707 12.513238 14.598778 15.641548 35.454175 11.470468 64.651731zM2288.288795 443.177189h-111.576375c-9.384929 0-17.727088 7.299389-18.769857 16.684318l-5.213849 31.283096-7.299389-11.470469c-23.983707-34.411405-77.164969-46.924644-131.389002-46.924643-123.046843 0-227.323829 92.806517-248.179226 223.152749-10.427699 64.651731 4.171079 127.217923 41.710794 171.014257 34.411405 39.625255 82.378819 56.309572 139.731161 56.309572 99.063136 0 153.287169-63.608961 153.287169-63.608961l-5.21385 31.283096c-2.08554 11.470468 7.299389 21.898167 18.769858 21.898167h100.105906c15.641548 0 29.197556-11.470468 32.325866-27.112017l60.480652-380.610998c2.08554-10.427699-6.256619-21.898167-18.769858-21.898167z m-154.329939 216.896131c-10.427699 63.608961-61.523422 106.362525-125.132383 106.362525-32.325866 0-58.395112-10.427699-75.079429-30.240326-16.684318-19.812627-22.940937-46.924644-17.727088-78.207739 10.427699-62.566191 61.523422-107.405295 124.089613-107.405295 31.283096 0 57.352342 10.427699 74.03666 30.240326 17.727088 20.855397 25.026477 47.967413 19.812627 79.250509z"
+                    fill="#003087" p-id="22656"></path>
+                <path
+                    d="M3943.164559 443.177189h-111.576375c-9.384929 0-17.727088 7.299389-18.769857 16.684318l-5.21385 31.283096-7.299389-11.470469c-23.983707-34.411405-77.164969-46.924644-131.389002-46.924643-123.046843 0-227.323829 92.806517-248.179226 223.152749-10.427699 64.651731 4.171079 127.217923 41.710795 171.014257 34.411405 39.625255 82.378819 56.309572 139.73116 56.309572 99.063136 0 153.287169-63.608961 153.28717-63.608961l-5.21385 31.283096c-2.08554 11.470468 7.299389 21.898167 18.769858 21.898167h100.105906c15.641548 0 29.197556-11.470468 32.325866-27.112017l60.480651-380.610998c2.08554-10.427699-6.256619-21.898167-18.769857-21.898167z m-154.329939 216.896131c-10.427699 63.608961-61.523422 106.362525-125.132383 106.362525-32.325866 0-58.395112-10.427699-75.07943-30.240326-16.684318-19.812627-22.940937-46.924644-17.727087-78.207739 10.427699-62.566191 61.523422-107.405295 124.089613-107.405295 31.283096 0 57.352342 10.427699 74.03666 30.240326 17.727088 20.855397 25.026477 47.967413 19.812627 79.250509z"
+                    fill="#009CDE" p-id="22657"></path>
+                <path
+                    d="M2880.582074 443.177189h-111.576375c-10.427699 0-20.855397 5.213849-27.112016 14.598778l-154.329939 227.323829-65.694501-217.9389c-4.171079-13.556008-16.684318-22.940937-31.283096-22.940937h-109.490835c-13.556008 0-22.940937 13.556008-18.769857 26.069247l123.046843 360.79837-115.747454 162.672098c-9.384929 12.513238 0 30.240326 15.641548 30.240326h111.576375c10.427699 0 20.855397-5.213849 26.069246-13.556008l371.226069-535.983707c11.470468-13.556008 2.08554-31.283096-13.556008-31.283096z"
+                    fill="#003087" p-id="22658"></path>
+                <path
+                    d="M4074.553561 245.050916l-94.892057 605.849288c-2.08554 11.470468 7.299389 21.898167 18.769857 21.898167h95.934827c15.641548 0 29.197556-11.470468 32.325866-27.112017l93.849287-595.421588c2.08554-11.470468-7.299389-21.898167-18.769857-21.898167h-107.405296c-10.427699 1.04277-18.769857 7.299389-19.812627 16.684317z"
+                    fill="#009CDE" p-id="22659"></path>
+                <path
+                    d="M782.529121 259.649695c12.513238-79.250509 0-133.474542-42.753564-182.484726C691.808143 22.940937 606.301015 0 496.81018 0H178.765374c-21.898167 0-41.710794 16.684318-44.839104 38.582485L0.451728 879.05499c-3.12831 16.684318 10.427699 31.283096 27.112016 31.283096h196.040733l-13.556008 85.507128c-2.08554 14.598778 9.384929 27.112016 23.983707 27.112016h165.800407c19.812627 0 36.496945-14.598778 39.625255-33.368635l2.08554-8.342159 31.283095-198.126273 2.08554-10.427699c3.12831-19.812627 19.812627-33.368635 39.625255-33.368635h25.026476c160.586558 0 285.718941-64.651731 322.215886-253.393075 15.641548-79.250509 7.299389-144.94501-33.368635-190.826884-12.513238-13.556008-28.154786-26.069246-45.881874-35.454175"
+                    fill="#009CDE" p-id="22660"></path>
+                <path
+                    d="M782.529121 259.649695c12.513238-79.250509 0-133.474542-42.753564-182.484726C691.808143 22.940937 606.301015 0 496.81018 0H178.765374c-21.898167 0-41.710794 16.684318-44.839104 38.582485L0.451728 879.05499c-3.12831 16.684318 10.427699 31.283096 27.112016 31.283096h196.040733l49.010184-312.830958-1.04277 9.384929c3.12831-21.898167 21.898167-38.582485 44.839104-38.582485h93.849287c183.527495 0 327.429735-74.03666 369.140529-289.89002l3.12831-18.769857"
+                    fill="#012169" p-id="22661"></path>
+                <path
+                    d="M326.838693 260.692464c2.08554-13.556008 10.427699-23.983707 21.898167-30.240326 5.213849-2.08554 11.470468-4.171079 16.684318-4.171079h250.264766c29.197556 0 57.352342 2.08554 82.378819 6.256619 7.299389 1.04277 14.598778 2.08554 20.855397 4.17108 7.299389 1.04277 13.556008 3.12831 19.812627 5.213849l9.384929 3.128309c12.513238 4.171079 23.983707 9.384929 34.411405 14.598779 12.513238-79.250509 0-133.474542-42.753564-182.484726C691.808143 22.940937 606.301015 0 496.81018 0H178.765374c-21.898167 0-41.710794 16.684318-44.839104 38.582485L0.451728 879.05499c-3.12831 16.684318 10.427699 31.283096 27.112016 31.283096h196.040733l49.010184-312.830958L326.838693 260.692464z"
+                    fill="#003087" p-id="22662"></path>
+              </svg>
             </el-radio>
             </el-radio>
           </el-radio-group>
           </el-radio-group>
 
 
           <div v-if="payType == '3'">
           <div v-if="payType == '3'">
-              <table class="table-border table" cellpadding="0" cellspacing="0">
-                <tr>
-                  <th colspan="2" class="head">线下缴费的收款信息</th>
-                </tr>
-                <tr>
-                  <th>付款金额</th>
-                  <td>
-                    ¥1840
-                    <div class="text-gray">请按照指定金额进行打款</div>
-                  </td>
-                </tr>
-                <tr>
-                  <th>收款账号</th>
-                  <td>
-                    7665 5278 8829 9377 7888 8888 88 <span class="text-primary size12">复制25位账号</span>
-                    <div class="text-gray">请勿重复打款</div>
-                  </td>
-                </tr>
-                <tr>
-                  <th>收款公司名</th>
-                  <td>无锡吉金体育有限公司</td>
-                </tr>
-                <tr>
-                  <th>开户银行</th>
-                  <td>招商银行无锡分行</td>
-                </tr>
-                <tr>
-                  <th>备注信息</th>
-                  <td>
-                    体育舞蹈报名费保险费
-                   </td>
-                </tr>
-                <tr>
-                  <th>联系人</th>
-                  <td>
-                    张译文
-                  </td>
-                </tr>
-                <tr>
-                  <th>联系电话</th>
-                  <td>16882846767</td>
-                </tr>
-                <tr>
-                  <th>操作</th>
-                  <td>
-                    <el-link class="mr10" type="primary"><el-icon><Upload /></el-icon>上传汇款单</el-link>
-                    <span class="text-danger size12">*您可以在上传汇款单完成后，与联系人进行电话确认。具体缴费结果，可以在个人中心-我的报名中查看进度</span>
-                  </td>
-                </tr>
-              </table>
+            <table class="table-border table" cellpadding="0" cellspacing="0">
+              <tr>
+                <th colspan="2" class="head">{{ language==0?'线下缴费的收款信息':'Offline Payment Collection Information' }}</th>
+              </tr>
+              <tr>
+                <th>{{ language==0?'付款金额':'Payment Amount' }}</th>
+                <td>
+                  ¥{{ totalFee }}
+                  <div class="text-gray">请按照指定金额进行打款</div>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'收款账号':`Receiver's Account Number` }}</th>
+                <td>
+                  {{ form.orgBankAccountNum }}
+                  <span v-if="language==0" class="text-primary size12">复制25位账号</span>
+                  <span v-else class="text-primary size12">Copy 25-digit Account Number</span>
+                  <div v-if="language==0" class="text-gray">请勿重复打款</div>
+                  <div v-else class="text-gray">Please do not make duplicate payments</div>
+                </td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'收款公司名':'Name of the Payee Company' }}</th>
+                <td>{{ form.orgBankAccount }}</td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'开户银行':'Bank Name' }}</th>
+                <td>{{ form.orgBankName }}</td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'备注信息':'Remarks' }}</th>
+                <td>
+                  体育舞蹈报名费保险费
+                </td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'联系人':'Contacts' }}</th>
+                <td>
+                  张译文
+                </td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'联系电话':'Telephone' }}</th>
+                <td>16882846767</td>
+              </tr>
+              <tr>
+                <th>{{ language==0?'操作':'Actions' }}</th>
+                <td>
+                  <el-link class="mr10" type="primary">
+                    <el-icon>
+                      <Upload/>
+                    </el-icon>
+                    {{ language==0?'上传汇款单':'Upload Remittance Receipt' }}
+                  </el-link>
+                  <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>
+                </td>
+              </tr>
+            </table>
 
 
             <div class="text-center">
             <div class="text-center">
               <el-button type="primary" round class="btn-lineG w200px">保存</el-button>
               <el-button type="primary" round class="btn-lineG w200px">保存</el-button>
             </div>
             </div>
           </div>
           </div>
           <div class="text-center mt20" v-else>
           <div class="text-center mt20" v-else>
-            <el-button type="primary" round class="btn-lineG w200px">保存</el-button>
+            <el-button type="primary" round class="btn-lineG w200px">确定</el-button>
           </div>
           </div>
         </div>
         </div>
 
 
       </el-card>
       </el-card>
     </div>
     </div>
 
 
+    <div class="box" v-if="errorBox">
+      <el-result
+          icon="error"
+          title="未找到对应订单"
+          sub-title="请确认订单号是否正确"
+      >
+        <template #extra>
+          <el-button type="primary" @click="goHome" class="btn-lineG w200px" round>{{ language==0?'返回首页':'Home' }}</el-button>
+        </template>
+      </el-result>
+    </div>
   </div>
   </div>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
 import {ref} from 'vue'
 import {ref} from 'vue'
+import {onMounted} from "@vue/runtime-core"
+import {useRoute,useRouter} from "vue-router"
+import * as match from "@/apiPc/match"
+import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row";
 
 
+const route = useRoute()
+const router = useRouter()
 const matchInfo = ref({})
 const matchInfo = ref({})
 const approved = ref(true)
 const approved = ref(true)
 const tableData = ref([])
 const tableData = ref([])
 const payType = ref('2')
 const payType = ref('2')
+const orderId = ref(route.query.orderId)
+const matchId = ref()
+const groupId = ref()
+import cache from "@/plugins/cache";
+import GroupInfoRow from "@/viewsPc/match/components/groupInfo-row";
+import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row";
+import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
+import ZuTable from "@/viewsPc/match/components/zu-table";
+import useUserStore from "@/store/modules/user";
+const isLogin = ref(false)
+const language = ref(cache.local.get('language') || 0)
+const signInfoList = ref([])
+const zuTableList = ref([])
+const totalFee = ref('')
+const form = ref({})
+const errorBox = ref(false)
+console.log(route.query.orderId)
+// 1763462073870237698
+getData()
+if (useUserStore().user) {
+  isLogin.value = true
+}
+function getData() {
+  match.getMyOrderDetail({orderId:orderId.value}).then(res => {
+    totalFee.value = res.data.totalFee
+    form.value = res.data
+    matchId.value = form.value.cptId
+    groupId.value = form.value.groupId || 0
+    if(isLogin.value){
+      getSignList()
+    }
+  }).catch(err=>{
+    console.log(err)
+    errorBox.value = true
+  })
+}
 
 
+function getSignList() {
+  match.getMySignInfoList({
+    cptId: matchId.value,
+    groupId: groupId.value
+  }).then(res => {
+    signInfoList.value = res.data.singleData
+    zuTableList.value = res.data.zuData
+  })
+}
+function goHome() {
+  router.push('/')
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-.el-radio.is-bordered{height: 40px;}
-.leftboderTT{font-weight: 600;
+.el-radio.is-bordered {
+  height: 40px;
+}
+
+.leftboderTT {
+  font-weight: 600;
   font-size: 16px;
   font-size: 16px;
-  color: #453DEA;}
+  color: #453DEA;
+}
+
 .bg-lineg {
 .bg-lineg {
   height: 40px;
   height: 40px;
   line-height: 40px;
   line-height: 40px;
   font-size: 18px;
   font-size: 18px;
   text-align: center;
   text-align: center;
 }
 }
-.table{width: 100%;max-width: 1000px;margin:20px auto;
-  .head{background: #EFF2F7;height: 50px;font-size: 16px;font-weight: 400;}
-  th{background: #FAFBFD;font-size: 14px;
-    border-bottom: 1px solid #E5E5E5;border-right: 1px solid #E5E5E5;}
-  td{border-bottom: 1px solid #E5E5E5;border-right: 1px solid #E5E5E5;
+
+.table {
+  width: 100%;
+  max-width: 1000px;
+  margin: 20px auto;
+
+  .head {
+    background: #EFF2F7;
+    height: 50px;
+    font-size: 16px;
+    font-weight: 400;
+  }
+
+  th {
+    background: #FAFBFD;
+    font-size: 14px;
+    border-bottom: 1px solid #E5E5E5;
+    border-right: 1px solid #E5E5E5;
+  }
+
+  td {
+    border-bottom: 1px solid #E5E5E5;
+    border-right: 1px solid #E5E5E5;
     padding: 10px;
     padding: 10px;
   }
   }
-  &.table-border{border-top: 1px solid #E5E5E5;border-left: 1px solid #E5E5E5;}
+
+  &.table-border {
+    border-top: 1px solid #E5E5E5;
+    border-left: 1px solid #E5E5E5;
+  }
 }
 }
-.text-gray{font-weight: 400;
+
+.text-gray {
+  font-weight: 400;
   font-size: 12px;
   font-size: 12px;
-  color: #929AA0;}
-.size12{font-size: 12px;}
-.result{font-size: 22px;
-  .flex{display: flex;align-items: center;font-weight: 500;
-    img{margin-right: 10px}
+  color: #929AA0;
+}
+
+.size12 {
+  font-size: 12px;
+}
+
+.result {
+  font-size: 22px;
+
+  .flex {
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+
+    img {
+      margin-right: 10px
+    }
   }
   }
-  .priceb{color: #7B7F83;font-size: 16px;text-align: right;
+
+  .priceb {
+    color: #7B7F83;
+    font-size: 16px;
+    text-align: right;
     line-height: 50px;
     line-height: 50px;
-    span{font-weight: bold;
-      font-size: 22px;font-family: DIN Alternate;
-      color: #EB6100;}
+
+    span {
+      font-weight: bold;
+      font-size: 22px;
+      font-family: DIN Alternate;
+      color: #EB6100;
+    }
+  }
+}
+.skeletonBox{position: relative;overflow: hidden;
+  .btn-lineG{position: absolute;left: 0;right: 0;margin: auto;top: 0;bottom: 0;
+    width: 200px;box-shadow: 0 0 1000px 500px rgba(255,255,255,0.5);
   }
   }
 }
 }
 </style>
 </style>

@@ -5,56 +5,18 @@
         <team-sign-step :language="language" :active-step="activeStep"/>
         <team-sign-step :language="language" :active-step="activeStep"/>
       </el-card>
       </el-card>
       <el-card :body-style="{ padding: '0px' }">
       <el-card :body-style="{ padding: '0px' }">
-        <match-info-row :matchInfo="matchInfo" :language="language"/>
-        <group-info-row :groupInfo="groupInfo" :language="language"/>
-        <coach-info-row :names="names" :language="language"/>
+        <match-info-row v-if="matchId" :match-id="matchId"/>
+        <group-info-row />
+        <coach-info-row  v-if="matchId" :match-id="matchId" :language="language"/>
         <div style="margin: 20px">
         <div style="margin: 20px">
 
 
         <div class="mt20">
         <div class="mt20">
-          <div class="leftboderTT">参赛人员清单</div>
-          <el-table :data="tableData" border style="width: 100%" class="mt20" :span-method="arraySpanMethod">
-            <el-table-column label="所属国家"/>
-            <el-table-column prop="name" label="姓氏" width="180" align="center"></el-table-column>
-            <el-table-column label="名"/>
-            <el-table-column label="短名"/>
-            <el-table-column prop="sex" label="性别" width="180" align="center"></el-table-column>
-            <el-table-column prop="age" label="年龄" width="180" align="center"></el-table-column>
-            <el-table-column label="出生日期" align="center"/>
-            <el-table-column prop="phone" label="手机号码" width="180" align="center"></el-table-column>
-            <el-table-column label="邮箱"/>
-            <el-table-column label="证件类型" align="center"/>
-            <el-table-column label="证件号码"/>
-            <el-table-column label="报项" fixed="right">
-              <template #default="scope">
-                <ol>
-                  <li v-for="item in scope.row.items" :key="item.id">{{ item.name }}</li>
-                </ol>
-              </template>
-            </el-table-column>
-            <el-table-column label="保险费" fixed="right" align="center">
-              <template #default="scope">
-                <span class="text-primary">¥{{ scope.row.signFee }}/人</span>
-              </template>
-            </el-table-column>
-          </el-table>
-
+          <div class="leftboderTT">{{ language==0?'参赛人员清单':'Participant List' }}</div>
+          <sign-info-table class="mt20" :match-id="matchId" :list="signInfoList" :hasAction="false"/>
         </div>
         </div>
         <div class="mt20">
         <div class="mt20">
-          <div class="leftboderTT">设项报名清单</div>
-          <!--            报项列表-->
-          <el-table :data="tableData" border style="width: 100%" class="mt20">
-            <el-table-column label="组别代码" align="center"/>
-            <el-table-column label="组别" align="center"/>
-            <el-table-column label="舞种" align="center"/>
-            <el-table-column label="参赛说明"/>
-            <el-table-column label="参赛运动员"/>
-            <el-table-column label="补充信息"/>
-            <el-table-column label="报名费" align="center">
-              <template #default="scope">
-                <span class="text-primary">¥{{ scope.row.signFee }}/人</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div class="leftboderTT">{{ language==0?'设项报名清单':'Event Registration List' }}</div>
+          <zu-table class="mt20"  :list="zuTableList" :hasAction="false"/>
         </div>
         </div>
         </div>
         </div>
 
 
@@ -64,20 +26,22 @@
         <el-row class="priceBar">
         <el-row class="priceBar">
           <el-col :lg="16" :xs="24" class="pd20">
           <el-col :lg="16" :xs="24" class="pd20">
             <div class="flex">
             <div class="flex">
-              <div class="item"><label>报名费：</label><span>¥3000</span></div>
-              <div class="item"><label>保险费：</label><span>¥3000</span></div>
-              <div class="item"><label>费用总计：</label><span>¥6000</span></div>
+              <div class="item"><label>{{ language==0?'报名费':'Registration Fee' }}：</label><span>¥{{form.cptRegistrationFee?.totalFee}}</span></div>
+              <div class="item"><label>{{ language==0?'保险费':'Insurance Fee' }}：</label><span>¥{{form.cptInsuranceFee?.totalFee}}</span></div>
+              <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}：</label><span>¥{{form.totalFee}}</span></div>
             </div>
             </div>
           </el-col>
           </el-col>
           <el-col :lg="8" :xs="24" class="text-right pd20">
           <el-col :lg="8" :xs="24" class="text-right pd20">
-            <el-link  type="primary"><el-icon><Upload /></el-icon>导出参赛人员清单</el-link>
-            <el-link  type="primary"><el-icon><Upload /></el-icon>导出设项报名清单</el-link>
+            <el-link  type="primary" @click="exportSignList(1)"><el-icon><Upload /></el-icon>
+              {{ language==0?'导出参赛人员清单':'Export Participant List' }}</el-link>
+            <el-link  type="primary" @click="exportSignList(2)"><el-icon><Upload /></el-icon>
+              {{ language==0?'导出设项报名清单':'Registration Fee for Event Entry' }}</el-link>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <div class="text-center pd20">
         <div class="text-center pd20">
-          <el-button type="primary" class="" plain round @click="goPrev()">上一步</el-button>
-          <el-button type="primary" class="" plain round @click="submitForm()">保存暂不提交审核</el-button>
-          <el-button type="primary" class="btn-lineG w200px" round @click="submitForm()">提交审核</el-button>
+          <el-button type="primary" class="" plain round @click="goPrev()">{{ language == 0 ? "上一步" : 'Go back' }}</el-button>
+          <el-button type="primary" class="" plain round @click="submitForm(0)">{{ language==0?'保存暂不提交审核':'Save, Do Not Submit for Review Yet' }}</el-button>
+          <el-button type="primary" class="btn-lineG w200px" round @click="submitForm(1)">{{ language==0?'提交审核':'Submit for review' }}</el-button>
         </div>
         </div>
       </el-card>
       </el-card>
     </div>
     </div>
@@ -89,64 +53,117 @@ import TeamSignStep from './components/teamSignStep'
 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row"
 import MatchInfoRow from "@/viewsPc/match/components/matchInfo-row"
 import GroupInfoRow from "@/viewsPc/match/components/groupInfo-row"
 import GroupInfoRow from "@/viewsPc/match/components/groupInfo-row"
 import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row"
 import CoachInfoRow from "@/viewsPc/match/components/coachInfo-row"
-
-import {ref} from "vue"
+import SignInfoTable from "@/viewsPc/match/components/signInfo-table"
+import {getCurrentInstance, ref} from "vue"
 import cache from "@/plugins/cache";
 import cache from "@/plugins/cache";
 import {onMounted} from "@vue/runtime-core";
 import {onMounted} from "@vue/runtime-core";
 import * as match from "@/apiPc/match"
 import * as match from "@/apiPc/match"
 import {useRoute, useRouter} from "vue-router";
 import {useRoute, useRouter} from "vue-router";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
+import ZuTable from "@/viewsPc/match/components/zu-table";
+import {ElMessageBox} from "element-plus";
+import {exportCn} from "@/apiPc/match";
 const route = useRoute()
 const route = useRoute()
 const router = useRouter()
 const router = useRouter()
 const activeStep = ref(3)
 const activeStep = ref(3)
-const matchInfo = ref({})
 const groupInfo = useUserStore().group || {}
 const groupInfo = useUserStore().group || {}
 const language = ref(cache.local.get('language') || 0)
 const language = ref(cache.local.get('language') || 0)
 const groupId = ref()
 const groupId = ref()
 const form = ref({})
 const form = ref({})
-const matchId = ref()
-const names = ref({})
+const matchId = ref(route.query.matchId)
+const signInfoList = ref([])
+const zuTableList = ref([])
+const {proxy} = getCurrentInstance()
 onMounted(()=>{
 onMounted(()=>{
-  console.log(route.query)
-  groupId.value = route.query.groupId || 0
+  // console.log(route.query)
   matchId.value = route.query.matchId
   matchId.value = route.query.matchId
-  getMatch()
-  getFee()
-  if(groupId.value!=0){
-    tuandui()
-  } else {
-    geren()
-  }
+  groupId.value = route.query.groupId || 0
+    getSignList()
+    getFee(groupId.value)
 })
 })
-const getMatch = () => {
-  match.getMatchById({ id: matchId.value }).then(res => {
-    matchInfo.value = res.data
-  })
-}
-function geren() {
-  match.getChooseDoneSingleCoachs(matchId.value).then(res => {
-    names.value = res.data
-  })
-}
 
 
-function tuandui() {
-  match.getChooseDoneGroupCoachs(matchId.value, groupId.value).then(res => {
-    names.value = res.data
+
+function getSignList() {
+  match.getMySignInfoList({
+    cptId: matchId.value,
+    groupId: groupId.value
+  }).then(res=>{
+    signInfoList.value = res.data.singleData
+    zuTableList.value = res.data.zuData
   })
   })
 }
 }
 const goPrev = () => {
 const goPrev = () => {
-  router.go(-1)
+  // router.go(-1)
+  router.push({
+    name: 'chooseSportsman',
+    query: {
+      matchId: matchId.value,
+      groupId: groupId.value
+    }
+  })
 }
 }
-const getFee = () => {
-  console.log(groupId.value)
-
+const getFee = (entryId) => {
   match.getTotalFee({
   match.getTotalFee({
-    entryId: groupId.value,
+    entryId: entryId,
     cptId: matchId.value
     cptId: matchId.value
   }).then(res => {
   }).then(res => {
     form.value = res.data
     form.value = res.data
   })
   })
 }
 }
+const submitForm = (n) => {
+  if(n==0){
+    ElMessageBox.confirm(`您当前的操作为暂存，并不是提交审核，必须在报名截止时间XXXX-XX-XX之前完成提交。\n` +
+        '\n' +
+        '您也可以在个人中心-我的报名中，找到这条报名，点击提交审核。','提示',{
+      confirmButtonText: '去个人中心',
+      cancelButtonText: '知道了',
+      type: 'warning'
+    }).then((res)=>{
+      console.log(res)
+      router.push({name: 'myMatch'})
+    })
+    return
+  }
+  match.commitSign({
+    groupId: groupId.value,
+    cptId: matchId.value
+  }).then(res=>{
+    router.push({
+      name:`commitDone`,
+      params: {
+        orderId: res.data
+      }
+    })
+  })
+}
+function exportSignList(n) {
+  var obj = {
+    cptId: matchId.value,
+    groupId: groupId.value,
+    type:n
+  }
+  var fileName
+  if(language.value==0){
+    if(n==1){
+      fileName = '参赛人员清单'
+    }else {
+      fileName = '设项报名清单'
+    }
+    proxy.download('/league/sign/exportCn', {
+      ...obj
+    }, `${fileName}_${new Date().getTime()}.xlsx`)
+  } else {
+    if(n==1){
+      fileName = 'Participant List'
+    }else {
+      fileName = 'Registration Fee for Event Entry'
+    }
+    proxy.download('/league/sign/exportEn', {
+      ...obj
+    }, `${fileName}_${new Date().getTime()}.xlsx`)
+  }
+
+}
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

@@ -7,7 +7,7 @@
       </el-card>
       </el-card>
       <div class="h20"></div>
       <div class="h20"></div>
       <div class="panel" style="box-shadow: var(--el-box-shadow)">
       <div class="panel" style="box-shadow: var(--el-box-shadow)">
-        <match-info-row :matchInfo="matchInfo" :language="language"/>
+        <match-info-row :match-id="cptId" :language="language"/>
         <div class="h20"></div>
         <div class="h20"></div>
           <el-form ref="ruleFormRef" label-width="120px" class="signForm"
           <el-form ref="ruleFormRef" label-width="120px" class="signForm"
                    :model="form" :rules="rules"
                    :model="form" :rules="rules"
@@ -108,8 +108,8 @@ const data = reactive({
     enBo:{}
     enBo:{}
   },
   },
   form: {},
   form: {},
-  groupId: 0,
-  cptId: 0,
+  groupId: route.query.groupId||0,
+  cptId: route.query.matchId||0,
   signType: false,
   signType: false,
   regionsList: [],
   regionsList: [],
   participantsInfoArr: [],
   participantsInfoArr: [],
@@ -143,9 +143,7 @@ const uploadUrl = ref('/upload/upLoadToFileServer')
 
 
 onMounted(() => {
 onMounted(() => {
   // 获取团体信息
   // 获取团体信息
-  groupId.value = route.query.groupId
   getGroupInfo()
   getGroupInfo()
-  cptId.value = route.query.matchId
   signType.value = route.query.signType
   signType.value = route.query.signType
 
 
   getRegionsList()
   getRegionsList()

@@ -5,8 +5,8 @@
         <!--    国内-机构注册-->
         <!--    国内-机构注册-->
         <el-card>
         <el-card>
           <el-steps :active="activeStep" finish-status="success" align-center>
           <el-steps :active="activeStep" finish-status="success" align-center>
-            <el-step title="创建账号"/>
-            <el-step title="注册完成"/>
+            <el-step :title="language==0?'创建账号':'create an account'"/>
+            <el-step :title="language==0?'注册完成':'stered successfully'" />
           </el-steps>
           </el-steps>
         </el-card>
         </el-card>
 
 
@@ -14,37 +14,53 @@
         <div v-if="activeStep==0">
         <div v-if="activeStep==0">
           <el-card style="min-height: 50vh">
           <el-card style="min-height: 50vh">
             <div class="pt30">
             <div class="pt30">
-              <el-form class="d-form" size="large" label-width="120"
+              <el-form class="d-form" size="large" :label-width="language==0?120:180"
                        style="max-width: 500px;margin: auto">
                        style="max-width: 500px;margin: auto">
-                <el-form-item label="WDSF卡号" required>
-                  <el-input type="text" v-model="form.WDSF" @change="resetCode(0)" @blur="verifyCode">
+                <el-form-item :label="language==0?'WDSF卡号':'WDSF'" required>
+                  <el-input type="text" v-model="form.card" @change="resetCode(0)" @blur="verifyCode">
                     <template #append>
                     <template #append>
-                      <el-button type="primary" plain style="width: 110px" @click="checkwdsf">
-                        <span>校验卡号</span>
+                      <el-button type="primary" plain style="width: 110px" @click="checkCard">
+                        <el-icon v-if="checkStatus" size="16" color="#67C23A"><CircleCheckFilled /></el-icon>
+                        <span v-else>{{ language==0?'校验卡号':'Check Code' }}</span>
                       </el-button>
                       </el-button>
                     </template>
                     </template>
                   </el-input>
                   </el-input>
+
                 </el-form-item>
                 </el-form-item>
-                <el-form-item label="手机/邮箱" required>
+                <el-form-item :label="language==0?'手机/邮箱':'E-mail / Phone number'" required>
                   <el-input type="text" v-model="form.account" @change="resetCode(1)" @blur="verifyCode"/>
                   <el-input type="text" v-model="form.account" @change="resetCode(1)" @blur="verifyCode"/>
                 </el-form-item>
                 </el-form-item>
-                <el-form-item label="验证码" required>
+                <el-form-item :label="language==0?'验证码':'Code'" required>
                   <el-input v-model="form.code">
                   <el-input v-model="form.code">
                     <template #append>
                     <template #append>
                       <el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
                       <el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
                         <count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
                         <count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
-                          {{ totalSeconds }} 秒
+                          {{ totalSeconds }} {{ language==0?'秒':'s' }}
                         </count-down>
                         </count-down>
-                        <span v-else>发送验证码</span>
+                        <span v-else>{{ language==0?'发送验证码':'Send code' }}</span>
                       </el-button>
                       </el-button>
                     </template>
                     </template>
                   </el-input>
                   </el-input>
                 </el-form-item>
                 </el-form-item>
+                <div class="h30"></div>
+                <div class="leftboderTT">{{ language == 0 ? '登录密码' : 'Password' }} <span
+                    v-if="language==0">(登录时需要验证，保护账户信息)</span></div>
+                <div class="h20"></div>
+                <el-form-item :label="language==0?'密码':'Password'" required>
+                  <el-input type="password" show-password v-model="form.password"
+                            :placeholder="language==0?'6-16位密码。区分大小写':''"/>
+                </el-form-item>
+                <el-form-item :label="language==0?'确认密码':'Confirm Password'" required>
+                  <el-input type="password" show-password v-model="form.confirmPassword" @blur="vconfirmPassword"
+                            :placeholder="language==0?'再次输入密码':'Confirm Password'"/>
+                </el-form-item>
               </el-form>
               </el-form>
             </div>
             </div>
             <div class="text-center">
             <div class="text-center">
               <!--      <el-button class="primary-kx" round @click="goBack">取消</el-button>-->
               <!--      <el-button class="primary-kx" round @click="goBack">取消</el-button>-->
-              <el-button type="primary" class="btn-lineG w200px" round @click="next">下一步</el-button>
+              <el-button type="primary" class="btn-lineG w200px" round @click="next">
+                {{ language==0?'立即注册':'Register Now' }}
+              </el-button>
             </div>
             </div>
           </el-card>
           </el-card>
         </div>
         </div>
@@ -66,19 +82,22 @@ import Vcode from "vue3-puzzle-vcode"
 import { ElMessage } from 'element-plus'
 import { ElMessage } from 'element-plus'
 import CountDown from '@chenfengyuan/vue-countdown'
 import CountDown from '@chenfengyuan/vue-countdown'
 import cache from '@/plugins/cache'
 import cache from '@/plugins/cache'
+import {checkWdsf, getCaptchaSms, registerSingle} from "@/apiPc/match";
+import {setToken} from "@/utils/auth";
 const language = ref(cache.local.get('language') || 0)
 const language = ref(cache.local.get('language') || 0)
 
 
 const data = reactive({
 const data = reactive({
   isShow:false,
   isShow:false,
   isCodeTrue:0,
   isCodeTrue:0,
   counting:false,
   counting:false,
+  checkStatus:false,
   form:{},
   form:{},
   activeStep: 0,
   activeStep: 0,
   failVcode:'验证失败，请重试',
   failVcode:'验证失败，请重试',
   successVcode:'验证通过！',
   successVcode:'验证通过！',
   sliderText: '拖动滑块完成拼图',
   sliderText: '拖动滑块完成拼图',
 })
 })
-const {isShow,isCodeTrue,counting,form,activeStep,failVcode,successVcode,sliderText} = toRefs(data)
+const {isShow,isCodeTrue,counting,form,activeStep,failVcode,successVcode,sliderText,checkStatus} = toRefs(data)
 onMounted(()=>{
 onMounted(()=>{
   if(language.value==1){
   if(language.value==1){
     failVcode.value = 'Error!'
     failVcode.value = 'Error!'
@@ -95,14 +114,15 @@ function sendsmsMsg() {
     }
     }
     return
     return
   }
   }
+
   if(counting.value){
   if(counting.value){
     return
     return
   } else {
   } else {
     isShow.value = true
     isShow.value = true
   }
   }
 }
 }
-function checkwdsf() {
-  if(!form.value.WDSF){
+function checkCard() {
+  if(!form.value.card){
     if(language.value==0){
     if(language.value==0){
       ElMessage.error('请填写WDSF卡号')
       ElMessage.error('请填写WDSF卡号')
     } else {
     } else {
@@ -125,13 +145,15 @@ function codeSuccess(msg) {
   isShow.value = false
   isShow.value = false
   isCodeTrue.value += 1
   isCodeTrue.value += 1
   if(isCodeTrue.value==1){
   if(isCodeTrue.value==1){
-
+    checkWdsf({card:form.value.card}).then(res=>{
+      checkStatus.value = res.data
+    })
   }
   }
   if(isCodeTrue.value==2){
   if(isCodeTrue.value==2){
     counting.value = true
     counting.value = true
-    // getCaptchaSms({account:form.value.account}).then(res=>{
-    //
-    // })
+    getCaptchaSms({account:form.value.account}).then(res=>{
+
+    })
   }
   }
 
 
 }
 }
@@ -139,10 +161,24 @@ function resetCode(n) {
   isCodeTrue.value = n
   isCodeTrue.value = n
 }
 }
 function next() {
 function next() {
-  activeStep.value = 1
+  registerSingle(form.value).then(res=>{
+    setToken(res.data.token)
+    activeStep.value = 1
+  })
 }
 }
 </script>
 </script>
 
 
-<style scoped>
+<style scoped lang="scss">
+.leftboderTT {
+  color: var(--el-color-primary);
+  font-size: 16px;
+  font-weight: 600;
 
 
+span {
+  color: #929AA0;
+  font-size: 14px;
+}
+}
+.h20{height: 20px}
+.h30{height: 30px}
 </style>
 </style>

@@ -10,7 +10,7 @@
           <template #append>
           <template #append>
             <el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
             <el-button type="primary" plain style="width: 110px" @click="sendsmsMsg">
               <count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
               <count-down v-if="counting" v-slot="{ totalSeconds }" :time="60000" @end="counting=false">
-                {{ totalSeconds }} 秒
+                {{ totalSeconds }} {{ language==0?'秒':'s' }}
               </count-down>
               </count-down>
               <span v-else>
               <span v-else>
                   {{ language==0?'发送验证码':'Send code' }}
                   {{ language==0?'发送验证码':'Send code' }}
@@ -89,9 +89,9 @@ function codeSuccess(msg) {
   isShow.value = false
   isShow.value = false
   isCodeTrue.value = true
   isCodeTrue.value = true
   counting.value = true
   counting.value = true
-  // getCaptchaSms({account:form.value.account}).then(res=>{
-  //
-  // })
+  getCaptchaSms({account:form.value.account}).then(res=>{
+
+  })
 }
 }
 function resetCode() {
 function resetCode() {
   isCodeTrue.value = false
   isCodeTrue.value = false

@@ -167,6 +167,7 @@ const goStep3 = () => {
       loading.value = true
       loading.value = true
       delete form.value.confirmPassword
       delete form.value.confirmPassword
       form.value.regionId = regionArr.value.pop()
       form.value.regionId = regionArr.value.pop()
+      form.value.username= props.accont
       match.pcRegisterTeam(form.value).then(res => {
       match.pcRegisterTeam(form.value).then(res => {
         setToken(res.data.token)
         setToken(res.data.token)
         emit('submit')
         emit('submit')

@@ -17,13 +17,14 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import {reactive} from "@vue/runtime-core";
-import {toRefs} from "@vueuse/shared/index";
+import {reactive,toRefs} from "@vue/runtime-core";
+const router = useRouter()
 import Vcode from "vue3-puzzle-vcode"
 import Vcode from "vue3-puzzle-vcode"
 import {ElMessage} from 'element-plus'
 import {ElMessage} from 'element-plus'
 import CountDown from '@chenfengyuan/vue-countdown'
 import CountDown from '@chenfengyuan/vue-countdown'
 import {getCaptchaSms, checkRegisterCode} from "@/apiPc/match"
 import {getCaptchaSms, checkRegisterCode} from "@/apiPc/match"
 import cache from '@/plugins/cache'
 import cache from '@/plugins/cache'
+import {useRouter} from "vue-router";
 const language = ref(cache.local.get('language') || 0)
 const language = ref(cache.local.get('language') || 0)
 const props = defineProps({
 const props = defineProps({
   accont:{
   accont:{
@@ -42,10 +43,15 @@ const {isShow, isCodeTrue, counting, form, activeStep} = toRefs(data)
 const emit = defineEmits(['submit', 'userName'])
 const emit = defineEmits(['submit', 'userName'])
 
 
 const goHome = () => {
 const goHome = () => {
-
+  router.push({
+    name: `home`
+  })
 }
 }
 const goSign = () => {
 const goSign = () => {
-
+  router.push({
+    name: `matchDetail`,
+    params:{id:0}
+  })
 }
 }
 
 
 </script>
 </script>

@@ -70,19 +70,19 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
         },
         },
         '/dev-api/ztx-match': {
         '/dev-api/ztx-match': {
-          target: 'http://192.168.1.132:8083',
+          target: 'http://192.168.1.131:8083',
           // target: 'http://192.168.1.132:8081',
           // target: 'http://192.168.1.132:8081',
           changeOrigin: true,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
         },
         },
         '/dev-api/ztx-webSite': {
         '/dev-api/ztx-webSite': {
           // target: 'http://123.60.96.243:1897/stage-api/',
           // target: 'http://123.60.96.243:1897/stage-api/',
-          target: 'http://192.168.1.130:8083/',
+          target: 'http://192.168.1.131:8083/',
           changeOrigin: true,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         },
         '/dev-api': {
         '/dev-api': {
-          target: 'http://192.168.1.130:8083',
+          target: 'http://192.168.1.131:8083',
           // target: 'http://localhost:8787',
           // target: 'http://localhost:8787',
           changeOrigin: true,
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
           rewrite: (p) => p.replace(/^\/dev-api/, '')