no message

@@ -112,6 +112,13 @@ export function checkWdsf(query) {
     params:query
   })
 }
+export function checkWdsfAthletes(query) {
+  return request({
+    url: `/league/wdsf/checkForGroup`,
+    method: 'get',
+    params:query
+  })
+}
 export function registerSingle(data) {
   return request({
     url: `/pcRegisterSingleAboard`,

@@ -73,6 +73,9 @@
       </el-row>
     </div>
   </div>
+  <el-affix position="bottom" :offset="200">
+    <img class="kf" src="@/assets/logo/kf.png"/>
+  </el-affix>
 </template>
 
 <script setup>
@@ -83,6 +86,8 @@ const language = useStorage('language', 0)
 </script>
 
 <style lang="scss" scoped>
+.kf{width: 100px;cursor: pointer; animation: pop 2s infinite;}
+
 .copyright{      font-size: 14px;
   opacity: 0.88;
   color: #4C5359;}

@@ -5,12 +5,14 @@
 <!--      <component :is="Component" :key="route.path" />-->
 <!--    </keep-alive>-->
 <!--  </router-view>-->
+
 </template>
 
 <script setup>
 </script>
 
 <style lang="scss" scoped>
+
 .app-main {
   /* 50= navbar  50  */
   width: 100%;

@@ -58,10 +58,10 @@ const data = reactive({
   loading: false,
   title: '选择开票订单',
   query:{
-    activeId:'',
-    createById:'',
-    invoiced:'1',
-    // venueId:''
+    // activeId:'',
+    // createById:'',
+    // invoiced:'1',
+    status:1
   },
   total:0
 })
@@ -84,8 +84,8 @@ const getList = () => {
   loading.value = true
   getCanInvoiceBills(query.value).then(res=>{
     loading.value = false
-    tableData.value = res.data.rows
-    total.value = res.data.total
+    tableData.value = res.rows
+    total.value = res.total
 
     for (var b of tableData.value) {
       b.messageObj = JSON.parse(b.message)

@@ -2,8 +2,6 @@
   <div>
     <index-Ch v-if="language ==0"/>
     <index-En v-else/>
-
-
     <div v-if="showgg" class="fixed_gg">
       <!--天气-->
       <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
@@ -94,5 +92,4 @@ const popWeather = () => {
 </script>
 
 <style scoped lang="scss">
-
 </style>

@@ -110,7 +110,7 @@ import * as match from '@/apiPc/match'
 import {ElMessage} from 'element-plus'
 import _ from 'lodash'
 import Vcode from "vue3-puzzle-vcode"
-import {checkWdsf} from "@/apiPc/match";
+import {checkWdsf, checkWdsfAthletes} from "@/apiPc/match";
 import {useStorage} from "@vueuse/core/index";
 
 const language = useStorage('language', 0)
@@ -209,7 +209,7 @@ watch(show, (value) => {
     card.value = ''
     isCodeTrue.value = false
     form.value = {
-      sex: '0'
+      // sex: '0'
     }
   }
   nextTick(() => {
@@ -226,8 +226,12 @@ function submitForm() {
   //   ElMessage.warning('Please upload your photo')
   //   return
   // }
+  if (!form.value.sex) {
+    ElMessage.warning(language.value == 0 ?'请选择性别':'Please select your gender')
+    return
+  }
   if (!form.value.passportUrl||form.value.passportUrl==''||form.value.passportUrl.length==0) {
-    ElMessage.warning('Please upload  passport file')
+    ElMessage.warning(language.value == 0 ?'请上传证件':'Please upload  passport file')
     return
   }
   if (editgay) {
@@ -320,13 +324,19 @@ function codeSuccess(msg) {
   console.log('验证通过' + msg);
   showVcode.value = false
   isCodeTrue.value = true
-  checkWdsf({card: card.value}).then(res => {
+  checkWdsfAthletes({card: card.value,groupId:groupId}).then(res => {
+    if (res.data.wdsfFlag==-1) {
+      ElMessage.warning('运动员国籍不符，无法绑定该团体')
+      isCodeTrue.value = false
+      return
+    }
+
     form.value = res.data
     form.value.xing = form.value.surname
     form.value.ming = form.value.name
     form.value.wdsfStatus = res.data.status
-    if (!form.value.sex) {
-      form.value.sex = '0'
+    if (form.value.sex) {
+      form.value.sex = res.data.sex
     }
     if (form.value.wdsfFlag == '0') {
       isCodeTrue.value = false

@@ -196,26 +196,19 @@
                   </div>
                 </el-col>
               </el-row>
-              <el-row :gutter="20" v-else>
-                <el-col :span="24" v-for="(t,index) in signDoneGroupList" :key="t.id">
-                  <div class="nowteamItem">
-                    <span>{{ index + 1 }}.</span>
-                    <el-avatar :size="80" :src="fillImgUrl(t.imgUrl||t.avatar)" :fit="cover"/>
-                    <div class="info">
-                      <h3 class="name">{{ t.name }}</h3>
-                      <p v-if="t.extraInfo">
-                          <span v-for="(ee,index) in JSON.parse(t.extraInfo)" :key="index"
-                                v-show="(ee?.type == '0'||ee?.type == '4')&&index<2">
-                            {{ ee.value }}&ensp;&ensp;
-                          </span>
-                      </p>
-                    </div>
-                    <p class="rr"><span>{{ t.renCi }}</span> {{ language==0?'人参赛':'registrants' }}</p>
-                  </div>
+              <el-row :gutter="20" class="pd20" v-else>
+                <el-col :span="24">
+                  <el-table :data="signDoneGroupList">
+                    <el-table-column :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
+                    <el-table-column :label="language == 0 ?'男运动员':'man name'" min-width="120"/>
+                    <el-table-column :label="language == 0 ?'女运动员':'woman name'" min-width="120"/>
+                    <el-table-column :label="language == 0 ?'组别':'Group'" min-width="120"/>
+                    <el-table-column :label="language == 0 ?'舞种':'Division'" min-width="120"/>
+                    <el-table-column :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
+                    <el-table-column :label="language == 0 ?'参赛队名称':'Team name'" min-width="120"/>
+                  </el-table>
                 </el-col>
               </el-row>
-              <el-empty :image="`/img/order_no.png`" :image-size="228"
-                        v-if="(signDoneGroupList==null)||(signDoneGroupList.length==0)" description=""/>
             </div>
             <div v-if="menu[4].active==1">
               <!--成绩-->
@@ -320,7 +313,7 @@ const data = reactive({
     {name: 'Event details', cn: '赛事详情', active: 1},
     {name: 'Event settings', cn: '赛事设项', active: 0},
     {name: 'Schedule', cn: '日程', active: 0},
-    {name: 'Participating teams', cn: '参赛队', active: 0},
+    {name: 'Participating teams', cn: '参赛人员', active: 0},
     {name: 'Achievement', cn: '成绩', active: 0},
     {name: 'Notes', cn: '报名须知', active: 0}],
   menu1: [

@@ -19,6 +19,9 @@
           <el-col :span="4">
             <el-card :body-style="{padding:0}">
               <ul class="meunUl">
+                <li>全国
+                  <el-tag round type="info">{{ countAll }}</el-tag>
+                </li>
                 <li v-for="r in regionsList" :key="r.id" :class="{'active':r.id==currRegion.id}" @click="changePv(r)">{{ r.cityName }}
                   <el-tag round type="info">{{ r.count }}</el-tag>
                 </li>
@@ -75,6 +78,7 @@ const regionsList = ref([])
 const currRegion = ref(null)
 const examSiteList = ref([])
 const total = ref(0)
+const countAll = ref(0)
 const query = ref({
   pageSize: 15,
   pageNum: 1,
@@ -100,14 +104,11 @@ const judeId = (val) => {
 }
 const getRegionsList = () => {
   return getExamRegionsList().then((res) => {
-    const sum = _.sumBy(res.data, (d) => d.count)
-    res.data.unshift({
-      id: null,
-      cityName: '全国',
-      count: sum
-    })
     regionsList.value = res.data
     currRegion.value = res.data[0]
+    for(var n of res.data){
+      countAll.value += n.count
+    }
   })
 }
 const getList = () => {

@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
         },
         '/dev-api': {
-          target: 'http://192.168.1.118:8081/',
+          target: 'http://192.168.1.131:8081/',
           // target: 'https://dance.itechtop.cn/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api',
           changeOrigin: true,