Merge branch 'dev' into order

@@ -41,7 +41,8 @@ export function getMySignDetailById(params) {
 // 获取赛事下的已报团队
 // 获取赛事下的已报团队
 export function getGroupListByCptId(cptId) {
 export function getGroupListByCptId(cptId) {
   return request({
   return request({
-    url: `/league/group/getGroupListByCptId/${cptId}`,
+    // url: `/league/group/getGroupListByCptId/${cptId}`,
+    url: `/league/sign/getSignInfoDataByCptId/${cptId}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }

@@ -73,9 +73,17 @@
       </el-row>
       </el-row>
     </div>
     </div>
   </div>
   </div>
-  <el-affix position="bottom" :offset="200">
-    <img class="kf" src="@/assets/logo/kf.png"/>
-  </el-affix>
+  <div class="fixed-right">
+    <a v-if="language==0" href="#" target="_blank"
+       onclick="javascript:window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=6c500b60-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=ZHCN','_blank','height=700px,width=700px,top=50,left=0,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')" title="客服" >
+      <img src="@/assets/logo/kf_c.png"/>
+    </a>
+
+    <a v-else target="_blank" href="#"
+       onclick="javascript:window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=707daf80-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=EN','_blank','height=700px,width=700px,top=100,left=150,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')" title="Live Chat">
+      <img class="kf" src="@/assets/logo/kf_e.png"/>
+    </a>
+  </div>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
@@ -86,8 +94,10 @@ const language = useStorage('language', 0)
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
-.kf{width: 100px;cursor: pointer; animation: pop 2s infinite;}
-
+.kf{width: 100px;cursor: pointer;
+  //animation: pop 2s infinite;
+}
+.fixed-right{position: fixed;right: 0;bottom: 200px;}
 .copyright{      font-size: 14px;
 .copyright{      font-size: 14px;
   opacity: 0.88;
   opacity: 0.88;
   color: #4C5359;}
   color: #4C5359;}

@@ -68,8 +68,8 @@ const props = defineProps({
 })
 })
 const language= useStorage('language',0)
 const language= useStorage('language',0)
 function goBooking(n) {
 function goBooking(n) {
-  // ElMessage.warning(language.value==0?'建设中,敬请期待':'Building！')
-  // return
+  ElMessage.warning(language.value==0?'建设中,敬请期待':'Building！')
+  return
   switch (n) {
   switch (n) {
     case 0:
     case 0:
       // 票务
       // 票务

@@ -199,13 +199,13 @@
               <el-row :gutter="20" class="pd20" v-else>
               <el-row :gutter="20" class="pd20" v-else>
                 <el-col :span="24">
                 <el-col :span="24">
                   <el-table :data="signDoneGroupList">
                   <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-column prop="groupCode" :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
+                    <el-table-column prop="maleAthName" :label="language == 0 ?'男运动员':'man name'" min-width="150"/>
+                    <el-table-column prop="femaleAthName" :label="language == 0 ?'女运动员':'woman name'" min-width="150"/>
+                    <el-table-column prop="group" :label="language == 0 ?'组别':'Group'" min-width="120"/>
+                    <el-table-column prop="danceType" :label="language == 0 ?'舞种':'Division'" min-width="120"/>
+                    <el-table-column prop="countryName" :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
+                    <el-table-column prop="groupName" :label="language == 0 ?'参赛队名称':'Team name'" min-width="150"/>
                   </el-table>
                   </el-table>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>