no message

@@ -133,6 +133,26 @@ export function getTeamBackNumberPre(qy) {
     params: qy
   })
 }
-
+export function getqySchedule(qy) {
+  return request({
+    url: `/league/schedule/querySchedule`,
+    method: 'get',
+    params: qy
+  })
+}
+export function getqySchedule2(qy) {
+  return request({
+    url: `/league/schedule/querySchedule2`,
+    method: 'get',
+    params: qy
+  })
+}
+export function getquerySchedule2Pre(qy) {
+  return request({
+    url: `/league/schedule/querySchedule2Pre`,
+    method: 'get',
+    params: qy
+  })
+}
 
 

@@ -22,29 +22,18 @@
           </el-button>
         </div>
 
-        <div v-if="list.length>0">
-          <div class="nowteamItem" v-for="(form, index) in list" :key="index">
-            <div class="info">
-              <div class="nowName text-center">
-                <span class="text-primary">{{ form.number }}</span>
-              </div>
-              <div>
-                <label>{{ language==0?'选手1':'Name1' }}：</label>{{ form.maleName }}
-                <span v-if="form.maleWdsf"> - {{ form.maleWdsf }}</span>
-              </div>
-              <div>
-                <label>{{ language==0?'选手2':'Name2' }}：</label>{{ form.femaleName }}
-                <span v-if="form.femaleWdsf"> - {{ form.femaleWdsf }}</span>
-              </div>
-              <div>
-                <label>{{ language==0?'代表队':'Represent' }}：</label>
-                {{ form.groupName }}
-              </div>
-              <div v-if="form.zuInfo">
-                <label> {{  language==0?'组别':'Event' }}：</label>{{ form.zuInfo }}
-              </div>
-            </div>
-          </div>
+        <div v-if="list.length>0" class="mt30">
+          <el-timeline>
+            <el-timeline-item placement="top"
+                v-for="(form, index) in list" :key="index"
+                :timestamp="form.date + '  ' + form.timeStr"
+            >
+              <div class="text-primary">{{ form.projectName }}</div>
+              <div>{{form.danceType}}</div>
+              <div>{{form.address}}</div>
+              <div></div>
+            </el-timeline-item>
+          </el-timeline>
         </div>
         <div v-else>
           <el-empty/>
@@ -69,16 +58,19 @@
           </ul>
         </div>
         <div v-if="teamlist.length>0" class="temell mt20">
-          <el-collapse v-model="activeNames" accordion>
-            <el-collapse-item :name="index" :title="team[0][0].groupName" v-for="(team,index) in teamlist" :key="index">
-              <div class="nowteamItem" v-for="(p,jndex) in team" :key="jndex">
-                <div class="fontSize14 text-bold">{{p[0].zuInfo}}</div>
-                <div v-for="f in p" :key="f.id">
-                  <span class="nowName text-primary">{{f.number}}</span>
-                  <span class="mr10">{{ language==0?'选手1':'Name1' }}：{{f.maleName}} </span>
-                  <span>{{ language==0?'选手2':'Name2' }}：{{f.femaleName}} </span>
-                </div>
-              </div>
+          <el-collapse  accordion>
+            <el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index">
+              <el-timeline>
+                <el-timeline-item placement="top"
+                                  v-for="(form, index) in team" :key="index"
+                                  :timestamp="form.date + '  ' + form.timeStr"
+                >
+                  <div class="text-primary">{{ form.projectName }}</div>
+                  <div>{{form.danceType}}</div>
+                  <div>{{form.address}}</div>
+                  <div></div>
+                </el-timeline-item>
+              </el-timeline>
             </el-collapse-item>
           </el-collapse>
         </div>
@@ -90,7 +82,13 @@
 <script setup>
 import {ref} from "vue";
 import {ElMessage} from "element-plus";
-import {getBackNumber, getTeamBackNumber, getTeamBackNumberPre} from "@/apiPc/common";
+import {
+  getquerySchedule2Pre,
+  getqySchedule,
+  getqySchedule2,
+  getTeamBackNumber,
+  getTeamBackNumberPre
+} from "@/apiPc/common";
 import {useStorage} from "@vueuse/core/index";
 
 const language = useStorage('language', 0)
@@ -103,14 +101,13 @@ const teamlist = ref([])
 const query = ref('')
 const query2 = ref('')
 const type = ref('')
-const activeNames = ref(0)
 const showGroupList = ref(false)
 const search = () => {
   if (!query.value) {
-    ElMessage.warning(language.value == 0 ? '请输入会员号/姓名' : 'Please enter WDSF MIN / Name')
+    ElMessage.warning(language.value == 0 ? '请输入搜索关键词' : 'Enter project name or code to Query')
     return
   }
-  getBackNumber({query: query.value}).then(res => {
+  getqySchedule({projectName: query.value}).then(res => {
     if (!res.data||res.data.length==0) {
       list.value = []
       //提示 '未找到结果，请重新查询'
@@ -128,7 +125,7 @@ const searchTeam = () => {
     return
   }
   loading.value = true
-  getTeamBackNumberPre({query: query2.value}).then(res => {
+  getquerySchedule2Pre({groupName: query2.value}).then(res => {
     loading.value = false
     if (!res.data||res.data.length==0) {
       groupList.value = []
@@ -153,6 +150,7 @@ const open = (param) => {
   groupList.value = []
   query.value = ''
   type.value = ''
+  loading.value = false
 }
 defineExpose({
   open
@@ -161,7 +159,7 @@ function showDetail(name) {
   query2.value = name
   showGroupList.value = false
   loading.value = true
-  getTeamBackNumber({query: name}).then(res => {
+  getqySchedule2({groupName: name}).then(res => {
     loading.value = false
     teamlist.value = res.data
   })

 <template>
   <div>
     <index-Ch v-if="language ==0" @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/>
-    <index-En v-else  @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber"/>
+    <index-En v-else  @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/>
     <div v-if="showgg" class="fixed_gg">
       <!--天气-->
       <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>

@@ -143,10 +143,7 @@
 <!--                  Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>-->
 <!--                </a>-->
                 <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="backNumberSearch">Back Number</a>
-<!--                <div>-->
-<!--                  <a class=" ding" style="font-size: 15px;margin-top: 10px" @click="handlePickup">Pick-up/drop-off service-->
-<!--                  </a>-->
-<!--                </div>-->
+                <a class="zn-btn ml20 btn-q"  v-show="matchData?.id=='1778253367748993026'"  @click="schSearchSearch">Schedule Inquiry</a>
 
               </div>
 
@@ -466,7 +463,7 @@ const navigationPic = ref({
 })
 const router = useRouter()
 const { proxy } = getCurrentInstance()
-const emit = defineEmits(['pop','backNumber'])
+const emit = defineEmits(['pop','backNumber','schSearch'])
 const time = ref(0)
 const etime = ref(0)
 
@@ -599,6 +596,12 @@ const backNumberSearch = () => {
   }
   emit('backNumber',params)
 }
+const schSearchSearch = () => {
+  var params = {
+    cptId:matchData.value.id
+  }
+  emit('schSearch',params)
+}
 const handlePickup=()=>{
   const params={
     cptId :matchData.value.id
@@ -624,7 +627,7 @@ const handlePickup=()=>{
   }
   border-radius: 15px;
   .zn-btn{background: #FFFFFF;text-transform: uppercase;
-    font-size: 18px;    width: fit-content;
+    font-size: 16px;    width: fit-content; margin: 5px 5px 5px 0;
     color: #453DEA;
     border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
   .item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0;