Merge commit 'f6e7ec6a' into dev

@@ -15,6 +15,7 @@ export function getMatchById(params) {
     params: params
     params: params
   })
   })
 }
 }
+
 export function refundApply(orderId) {
 export function refundApply(orderId) {
   return request({
   return request({
     url: `/league/signOrder/refundApply?orderId=${orderId}`,
     url: `/league/signOrder/refundApply?orderId=${orderId}`,
@@ -39,7 +40,7 @@ export function getMySignDetailById(params) {
 }
 }
 
 
 // 获取赛事下的已报团队
 // 获取赛事下的已报团队
-export function getGroupListByCptId(cptId,query) {
+export function getGroupListByCptId(cptId, query) {
   return request({
   return request({
     // url: `/league/group/getGroupListByCptId/${cptId}`,
     // url: `/league/group/getGroupListByCptId/${cptId}`,
     url: `/league/sign/getSignInfoDataByCptId/${cptId}`,
     url: `/league/sign/getSignInfoDataByCptId/${cptId}`,
@@ -85,6 +86,7 @@ export function getCaptchaSms(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 // 发送手机验证码
 // 发送手机验证码
 export function getCaptchaSms2(data) {
 export function getCaptchaSms2(data) {
   return request({
   return request({
@@ -93,6 +95,7 @@ export function getCaptchaSms2(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function checkRegisterCode(data) {
 export function checkRegisterCode(data) {
   return request({
   return request({
     url: `/checkRegisterCode`,
     url: `/checkRegisterCode`,
@@ -107,32 +110,36 @@ export function getMyGroupList() {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function checkWdsf(query) {
 export function checkWdsf(query) {
   return request({
   return request({
     url: `/league/wdsf/check`,
     url: `/league/wdsf/check`,
     method: 'get',
     method: 'get',
-    params:query
+    params: query
   })
   })
 }
 }
+
 export function checkWdsfAthletes(query) {
 export function checkWdsfAthletes(query) {
   return request({
   return request({
     url: `/league/wdsf/checkForGroup`,
     url: `/league/wdsf/checkForGroup`,
     method: 'get',
     method: 'get',
-    params:query
+    params: query
   })
   })
 }
 }
+
 export function registerSingle(data) {
 export function registerSingle(data) {
   return request({
   return request({
     url: `/pcRegisterSingleAboard`,
     url: `/pcRegisterSingleAboard`,
     method: 'post',
     method: 'post',
-    data:data
+    data: data
   })
   })
 }
 }
+
 export function loginSingle(data) {
 export function loginSingle(data) {
   return request({
   return request({
     url: `/userLoginAboard`,
     url: `/userLoginAboard`,
     method: 'post',
     method: 'post',
-    data:data
+    data: data
   })
   })
 }
 }
 
 
@@ -159,6 +166,7 @@ export function saveMyGroup(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function saveMyGroupForCpt(data) {
 export function saveMyGroupForCpt(data) {
   return request({
   return request({
     url: `/league/group/saveMyGroupForCpt`,
     url: `/league/group/saveMyGroupForCpt`,
@@ -166,6 +174,7 @@ export function saveMyGroupForCpt(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function commitAudit(data) {
 export function commitAudit(data) {
   return request({
   return request({
     url: `/league/group/commitAudit`,
     url: `/league/group/commitAudit`,
@@ -236,12 +245,14 @@ export function saveMyTeam(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function withDrawByOrderId(orderId) {
 export function withDrawByOrderId(orderId) {
   return request({
   return request({
     url: `/league/signOrder/withDraw/${orderId}`,
     url: `/league/signOrder/withDraw/${orderId}`,
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+
 export function recoverMySignFromCancel(cptId) {
 export function recoverMySignFromCancel(cptId) {
   return request({
   return request({
     url: `/league/sign/recoverMySignFromCancel`,
     url: `/league/sign/recoverMySignFromCancel`,
@@ -317,14 +328,15 @@ export function getMyGroupForCptFilter(groupId, cptId, query) {
   })
   })
 }
 }
 
 
-export function getGroupPersonList(query,groupId) {
+export function getGroupPersonList(query, groupId) {
   return request({
   return request({
     url: `/systemj/personInfo/getPersonInfoListByGroupIdNoLabel/${groupId}`,
     url: `/systemj/personInfo/getPersonInfoListByGroupIdNoLabel/${groupId}`,
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
 }
 }
-export function getPerPersonList(query,userId) {
+
+export function getPerPersonList(query, userId) {
   return request({
   return request({
     url: `/systemj/personInfo/getPersonInfoListByPersonIdNoLabel/${userId}`,
     url: `/systemj/personInfo/getPersonInfoListByPersonIdNoLabel/${userId}`,
     method: 'get',
     method: 'get',
@@ -364,6 +376,7 @@ export function savePersonForMyPerson(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function savePersonForMyPerson2(data) {
 export function savePersonForMyPerson2(data) {
   return request({
   return request({
     url: `/systemj/personInfo/savePersonForMyPerson2`,
     url: `/systemj/personInfo/savePersonForMyPerson2`,
@@ -388,6 +401,7 @@ export function delPerson(id) {
     method: 'delete'
     method: 'delete'
   })
   })
 }
 }
+
 //个人账号
 //个人账号
 export function delPersonForPersonal(id) {
 export function delPersonForPersonal(id) {
   return request({
   return request({
@@ -432,12 +446,14 @@ export function getCanSignlevelListFromSelectPerson(groupId, personId) {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function delRank(id) {
 export function delRank(id) {
   return request({
   return request({
     url: `/league/team/${id}`,
     url: `/league/team/${id}`,
     method: 'delete'
     method: 'delete'
   })
   })
 }
 }
+
 export function getCanSignLevelPerson(data) {
 export function getCanSignLevelPerson(data) {
   return request({
   return request({
     url: `/league/competitionLevel/getCanSignLevelPerson`,
     url: `/league/competitionLevel/getCanSignLevelPerson`,
@@ -445,6 +461,7 @@ export function getCanSignLevelPerson(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function sportsmanDone(data) {
 export function sportsmanDone(data) {
   return request({
   return request({
     url: `/league/sign/signUp`,
     url: `/league/sign/signUp`,
@@ -452,6 +469,7 @@ export function sportsmanDone(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 // 删除报名接口
 // 删除报名接口
 export function deleteSign(id) {
 export function deleteSign(id) {
   return request({
   return request({
@@ -459,6 +477,7 @@ export function deleteSign(id) {
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+
 // 选择运动员的补充信息表头
 // 选择运动员的补充信息表头
 export function getCptExtraInfo(cptId) {
 export function getCptExtraInfo(cptId) {
   return request({
   return request({
@@ -466,6 +485,7 @@ export function getCptExtraInfo(cptId) {
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function recoverMySign(data) {
 export function recoverMySign(data) {
   return request({
   return request({
     url: `/league/sign/recoverMySign`,
     url: `/league/sign/recoverMySign`,
@@ -473,6 +493,7 @@ export function recoverMySign(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 // 生成订单
 // 生成订单
 export function commitSign(data) {
 export function commitSign(data) {
   return request({
   return request({
@@ -481,24 +502,28 @@ export function commitSign(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function getTotalFee(data) {
 export function getTotalFee(data) {
   return request({
   return request({
     url: `/league/expenseConfig/getTotalFee/${data.cptId}/${data.entryId}`,
     url: `/league/expenseConfig/getTotalFee/${data.cptId}/${data.entryId}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function getMemberInfoByCptId(cptId) {
 export function getMemberInfoByCptId(cptId) {
   return request({
   return request({
     url: `/systemj/member/editMemberCode/${cptId}`,
     url: `/systemj/member/editMemberCode/${cptId}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function getTemplate() {
 export function getTemplate() {
   return request({
   return request({
     url: `/systemj/personInfo/getTemplate`,
     url: `/systemj/personInfo/getTemplate`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 // 支付 orderId,payType
 // 支付 orderId,payType
 export function payMatch(data) {
 export function payMatch(data) {
   return request({
   return request({
@@ -507,12 +532,14 @@ export function payMatch(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function cancelMyUnPayedOrder(orderId) {
 export function cancelMyUnPayedOrder(orderId) {
   return request({
   return request({
     url: `/league/signOrder/cancelMyUnPayedOrder/${orderId}`,
     url: `/league/signOrder/cancelMyUnPayedOrder/${orderId}`,
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+
 export function getMySignListFromBaoXiang(data) {
 export function getMySignListFromBaoXiang(data) {
   return request({
   return request({
     url: `/league/sign/getMySignListFromBaoXiang`,
     url: `/league/sign/getMySignListFromBaoXiang`,
@@ -520,12 +547,14 @@ export function getMySignListFromBaoXiang(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function deleteMyGroup(groupId) {
 export function deleteMyGroup(groupId) {
   return request({
   return request({
     url: `/league/group/deleteMyGroup/${groupId}`,
     url: `/league/group/deleteMyGroup/${groupId}`,
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+
 export function checkPerson(data) {
 export function checkPerson(data) {
   return request({
   return request({
     url: `/systemj/personInfo/checkPersonInfoExist`,
     url: `/systemj/personInfo/checkPersonInfoExist`,
@@ -533,12 +562,14 @@ export function checkPerson(data) {
     data: data
     data: data
   })
   })
 }
 }
+
 export function getMySignListTree(cptId, personId, teamId) {
 export function getMySignListTree(cptId, personId, teamId) {
   return request({
   return request({
     url: `/league/competitionProject/getAllInfoFromSelectPerson/${cptId}/${personId}/${teamId || 0}`,
     url: `/league/competitionProject/getAllInfoFromSelectPerson/${cptId}/${personId}/${teamId || 0}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function getMySignInfoList(data) {
 export function getMySignInfoList(data) {
   return request({
   return request({
     url: `/league/sign/getMySignInfoList`,
     url: `/league/sign/getMySignInfoList`,
@@ -546,6 +577,7 @@ export function getMySignInfoList(data) {
     params: data
     params: data
   })
   })
 }
 }
+
 export function exportCn(data) {
 export function exportCn(data) {
   return request({
   return request({
     url: `/league/sign/exportCn`,
     url: `/league/sign/exportCn`,
@@ -553,37 +585,44 @@ export function exportCn(data) {
     params: data
     params: data
   })
   })
 }
 }
+
 export function saveMyGroupExtraInfo(data) {
 export function saveMyGroupExtraInfo(data) {
   return request({
   return request({
     url: `/league/competitionGroupInfo/saveMyGroupExtraInfo`,
     url: `/league/competitionGroupInfo/saveMyGroupExtraInfo`,
     method: 'post',
     method: 'post',
     data: data
     data: data
   })
   })
-}export function pcRegisterTeam(data) {
+}
+
+export function pcRegisterTeam(data) {
   return request({
   return request({
     url: `/pcRegisterTeam`,
     url: `/pcRegisterTeam`,
     method: 'post',
     method: 'post',
     data: data
     data: data
   })
   })
 }
 }
+
 export function getMySignIds(cptId, personId, teamId) {
 export function getMySignIds(cptId, personId, teamId) {
   return request({
   return request({
     url: `/league/sign/getSignEntityByPersonId/${cptId}/${personId}/${teamId || 0}`,
     url: `/league/sign/getSignEntityByPersonId/${cptId}/${personId}/${teamId || 0}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function querySonLevel(parentId) {
 export function querySonLevel(parentId) {
   return request({
   return request({
     url: `/league/competitionSonLevel/querySonLevelByParentId/${parentId}`,
     url: `/league/competitionSonLevel/querySonLevelByParentId/${parentId}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function getPayedOrderPdf(cptId, groupId) {
 export function getPayedOrderPdf(cptId, groupId) {
   return request({
   return request({
     url: `/pdf/getPayedOrderPdf/${cptId}/${groupId}`,
     url: `/pdf/getPayedOrderPdf/${cptId}/${groupId}`,
     method: 'get'
     method: 'get'
   })
   })
 }
 }
+
 export function checkNoRepeat(query) {
 export function checkNoRepeat(query) {
   return request({
   return request({
     url: `/league/wdsf/checkNoRepeat`,
     url: `/league/wdsf/checkNoRepeat`,
@@ -592,20 +631,22 @@ export function checkNoRepeat(query) {
   })
   })
 }
 }
 
 
-export function saveWdsfMin(obj,groupId) {
+export function saveWdsfMin(obj, groupId) {
   return request({
   return request({
     url: `systemj/personInfo/bindWdsfForGroup/${groupId}`,
     url: `systemj/personInfo/bindWdsfForGroup/${groupId}`,
     method: 'post',
     method: 'post',
-    data:obj
+    data: obj
   })
   })
 }
 }
+
 //todo
 //todo
-export function bindWdsf(perId,card) {
+export function bindWdsf(perId, card) {
   return request({
   return request({
     url: `/systemj/personInfo/bindWdsf/${perId}?card=${card}`,
     url: `/systemj/personInfo/bindWdsf/${perId}?card=${card}`,
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+
 export function getProjectPageByPerIds(query) {
 export function getProjectPageByPerIds(query) {
   return request({
   return request({
     url: `/league/competitionProject/getProjectPageByPerIds/${query.cptId}/${query.perIds}`,
     url: `/league/competitionProject/getProjectPageByPerIds/${query.cptId}/${query.perIds}`,
@@ -613,6 +654,7 @@ export function getProjectPageByPerIds(query) {
     params: query
     params: query
   })
   })
 }
 }
+
 export function getMatchNewslistByCode(query) {
 export function getMatchNewslistByCode(query) {
   return request({
   return request({
     url: `/ztx/notesort/listByCode`,
     url: `/ztx/notesort/listByCode`,
@@ -625,67 +667,76 @@ export function createWePay(data) {
   return request({
   return request({
     url: `/league/signOrder/wxPay`,
     url: `/league/signOrder/wxPay`,
     method: 'post',
     method: 'post',
-    data:data
+    data: data
   })
   })
 }
 }
+
 export function createWePayPhone(data) {
 export function createWePayPhone(data) {
   return request({
   return request({
     url: `/league/signOrder/wxH5Pay`,
     url: `/league/signOrder/wxH5Pay`,
     method: 'post',
     method: 'post',
-    data:data
+    data: data
   })
   })
 }
 }
+
 export function createPalPay(data) {
 export function createPalPay(data) {
   return request({
   return request({
     url: `/league/signOrder/palPay`,
     url: `/league/signOrder/palPay`,
     method: 'post',
     method: 'post',
-    data:data
+    data: data
   })
   })
 }
 }
+
 export function callbackPalPay(tradeNo) {
 export function callbackPalPay(tradeNo) {
   return request({
   return request({
     url: `/league/signOrder/palPay/callback`,
     url: `/league/signOrder/palPay/callback`,
     method: 'post',
     method: 'post',
-    data:{
-      tradeNo:tradeNo
+    data: {
+      tradeNo: tradeNo
     }
     }
   })
   })
 }
 }
+
 export function upReceipt(data) {
 export function upReceipt(data) {
   return request({
   return request({
     url: `/league/signOrder/offlinePay`,
     url: `/league/signOrder/offlinePay`,
     method: 'post',
     method: 'post',
-    data:data
+    data: data
   })
   })
 }
 }
+
 export function signgetSignInfoConflict(query) {
 export function signgetSignInfoConflict(query) {
   return request({
   return request({
     url: `/league/sign/getSignInfoConflict`,
     url: `/league/sign/getSignInfoConflict`,
     method: 'get',
     method: 'get',
-    params:query
+    params: query
   })
   })
 }
 }
+
 export function checkMate(query) {
 export function checkMate(query) {
   return request({
   return request({
     url: `/systemj/personInfo/checkMate`,
     url: `/systemj/personInfo/checkMate`,
     method: 'get',
     method: 'get',
-    params:query
+    params: query
   })
   })
 }
 }
+
 export function checkIdcCode(query) {
 export function checkIdcCode(query) {
   return request({
   return request({
     url: `/systemj/personInfo/extractInfo`,
     url: `/systemj/personInfo/extractInfo`,
     method: 'get',
     method: 'get',
-    params:query
+    params: query
   })
   })
 }
 }
-export function getProjectByCptId(cptId,query) {
+
+export function getProjectByCptId(cptId, query) {
   return request({
   return request({
     url: `/league/competitionProject/getTableByLanguageSourceAndCptId/${cptId}`,
     url: `/league/competitionProject/getTableByLanguageSourceAndCptId/${cptId}`,
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
 }
 }
+
 export function addInvitation(data) {
 export function addInvitation(data) {
   return request({
   return request({
     url: `/league/person`,
     url: `/league/person`,
@@ -693,3 +744,21 @@ export function addInvitation(data) {
     data: data
     data: data
   })
   })
 }
 }
+
+// 酒店预约查询
+export function hotelList(params) {
+  return request({
+    url: `/ota/reservedRoom/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 飞机预约查询
+export function aircraft(params) {
+  return request({
+    url: `/league/pickup/query`,
+    method: 'get',
+    params
+  })
+}

@@ -313,6 +313,12 @@ export const constantRoutes = [
             component: () => import('@/viewsPc/match/detail_en'),
             component: () => import('@/viewsPc/match/detail_en'),
             name: 'matchDetail',
             name: 'matchDetail',
             meta: {title: '赛事详情'}
             meta: {title: '赛事详情'}
+          },
+          {
+            path: 'list/reservationSearch',
+            component: () => import('@/viewsPc/match/reservationSearch.vue'),
+            name: 'reservationSearch',
+            meta: {title: '预订查询'}
           }
           }
         ]
         ]
       },
       },

@@ -6,30 +6,31 @@
     </div>
     </div>
     <div class="box">
     <div class="box">
       <div class="searchBar">
       <div class="searchBar">
-        <el-input :placeholder="language==0?'请输入关键字搜索':'Search'" v-model="query.name" class="no-border">
+        <el-input v-model="query.name" :placeholder="language==0?'请输入关键字搜索':'Search'" class="no-border">
         </el-input>
         </el-input>
-        <el-button size="large" type="primary" class="btn-lineG" icon="search" @click="getList">
-          {{ language==0?'搜索':'Search' }}</el-button>
+        <el-button class="btn-lineG" icon="search" size="large" type="primary" @click="getList">
+          {{ language == 0 ? '搜索' : 'Search' }}
+        </el-button>
       </div>
       </div>
     </div>
     </div>
-    <div class="box" v-loading="loading">
+    <div v-loading="loading" class="box">
       <el-collapse v-model="activeName" accordion style="--el-collapse-header-height:'auto'">
       <el-collapse v-model="activeName" accordion style="--el-collapse-header-height:'auto'">
-        <el-collapse-item  :name="index"  v-for="(h,index) in list" class="hotel">
+        <el-collapse-item v-for="(h,index) in list" :name="index" class="hotel">
           <template #title>
           <template #title>
-            <el-row align="middle" :gutter="20" class="w100">
+            <el-row :gutter="20" align="middle" class="w100">
               <el-col :span="4">
               <el-col :span="4">
-                <div class="index">{{ language==0?'路线':'Route' }}{{index+1}}
+                <div class="index">{{ language == 0 ? '路线' : 'Route' }}{{ index + 1 }}
                   <img src="@/assets/booking/arrow.png"/>
                   <img src="@/assets/booking/arrow.png"/>
                 </div>
                 </div>
               </el-col>
               </el-col>
               <el-col :span="7">
               <el-col :span="7">
-                <p class="esp">{{h.checkIn}}</p>
+                <p class="esp">{{ h.checkIn }}</p>
               </el-col>
               </el-col>
               <el-col :span="4" class="text-center">
               <el-col :span="4" class="text-center">
                 <img class="mauto w40px" src="@/assets/booking/wf.png"/>
                 <img class="mauto w40px" src="@/assets/booking/wf.png"/>
               </el-col>
               </el-col>
               <el-col :span="7">
               <el-col :span="7">
-                <p class="esp ">{{h.checkOut}}</p>
+                <p class="esp ">{{ h.checkOut }}</p>
               </el-col>
               </el-col>
             </el-row>
             </el-row>
           </template>
           </template>
@@ -45,34 +46,40 @@
                 <el-col :span="14">
                 <el-col :span="14">
                   <h3 class="name flex">{{ r.carType }}
                   <h3 class="name flex">{{ r.carType }}
                     <div class="tagbox">
                     <div class="tagbox">
-                      <span class="tag">{{r.carColor}}</span>
-                      <span class="tag" v-show="r.checkOut==1">{{ language==0?'可送车':'drop-off' }}</span>
-                      <span class="tag" v-show="r.checkIn==1">{{ language==0?'可接车':'pick-up' }}</span>
+                      <span class="tag">{{ r.carColor }}</span>
+                      <span v-show="r.checkOut==1" class="tag">{{ language == 0 ? '可送车' : 'drop-off' }}</span>
+                      <span v-show="r.checkIn==1" class="tag">{{ language == 0 ? '可接车' : 'pick-up' }}</span>
                     </div>
                     </div>
                   </h3>
                   </h3>
                   <div class="text-gray mt20">
                   <div class="text-gray mt20">
-                    <span class="mr20">{{ language==0?'座位数':'Seats' }}: {{r.carSeat}}</span>
+                    <span class="mr20">{{ language == 0 ? '座位数' : 'Seats' }}: {{ r.carSeat }}</span>
                     <span class="mr20">|</span>
                     <span class="mr20">|</span>
-                    <span :span="8">{{ language==0?'运营时间':'Servers Time' }}: {{r.operStart}} ~ {{r.operEnd}}</span>
+                    <span :span="8">{{
+                        language == 0 ? '运营时间' : 'Servers Time'
+                      }}: {{ r.operStart }} ~ {{ r.operEnd }}</span>
                   </div>
                   </div>
                 </el-col>
                 </el-col>
                 <el-col :span="3">
                 <el-col :span="3">
-                  <div class="price" v-if="language==0">¥
-                    <span v-if="r.outPrice&&r.inPrice">{{Number(r.inPrice) > Number(r.outPrice)?r.outPrice:r.inPrice}}</span>
-                    <span v-else-if="r.inPrice>0">{{r.inPrice}}</span>
-                    <span v-else>{{r.outPrice}}</span>
+                  <div v-if="language==0" class="price">¥
+                    <span
+                      v-if="r.outPrice&&r.inPrice">{{ Number(r.inPrice) > Number(r.outPrice) ? r.outPrice : r.inPrice }}</span>
+                    <span v-else-if="r.inPrice>0">{{ r.inPrice }}</span>
+                    <span v-else>{{ r.outPrice }}</span>
                     起
                     起
                   </div>
                   </div>
-                  <div class="price" v-else>
+                  <div v-else class="price">
                     €
                     €
-                    <span v-if="r.outPriceEn&&r.inPriceEn">{{(Number(r.inPriceEn)||0) > Number(r.outPriceEn)?r.outPriceEn:r.inPriceEn}}</span>
-                    <span v-else-if="r.inPriceEn>0">{{r.inPriceEn}}</span>
-                    <span v-else>{{r.outPriceEn}}</span>
+                    <span
+                      v-if="r.outPriceEn&&r.inPriceEn">{{ (Number(r.inPriceEn) || 0) > Number(r.outPriceEn) ? r.outPriceEn : r.inPriceEn }}</span>
+                    <span v-else-if="r.inPriceEn>0">{{ r.inPriceEn }}</span>
+                    <span v-else>{{ r.outPriceEn }}</span>
                   </div>
                   </div>
 
 
                 </el-col>
                 </el-col>
                 <el-col :span="3">
                 <el-col :span="3">
-                  <el-button class="btn-lineG w100" round type="primary"   @click="goOrder(h,r)">{{ language==0?'我要预订':'Select' }}</el-button>
+                  <el-button class="btn-lineG w100" round type="primary" @click="goOrder(h,r)">
+                    {{ language == 0 ? '我要预订' : 'Select' }}
+                  </el-button>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
             </div>
             </div>
@@ -84,7 +91,7 @@
       </el-collapse>
       </el-collapse>
 
 
 
 
-      <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228"  description="" />
+      <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description=""/>
       <div style="height: 50px"></div>
       <div style="height: 50px"></div>
     </div>
     </div>
 
 
@@ -94,111 +101,252 @@
 <script setup>
 <script setup>
 import {onMounted} from "@vue/runtime-core"
 import {onMounted} from "@vue/runtime-core"
 import * as booking from "@/apiPc/booking"
 import * as booking from "@/apiPc/booking"
-import {useRouter,useRoute} from "vue-router";
+import {useRouter, useRoute} from "vue-router";
 import {useStorage} from "@vueuse/core/index";
 import {useStorage} from "@vueuse/core/index";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
+
 const user = useUserStore().user
 const user = useUserStore().user
 const router = useRouter()
 const router = useRouter()
 const route = useRoute()
 const route = useRoute()
-const language= useStorage('language',0)
+const language = useStorage('language', 0)
 const query = ref({
 const query = ref({
-  name:''
+  name: ''
 })
 })
 const activeName = ref(0)
 const activeName = ref(0)
 const cptId = ref('')
 const cptId = ref('')
 const list = ref([])
 const list = ref([])
 const loading = ref(false)
 const loading = ref(false)
-onMounted(()=>{
+onMounted(() => {
   query.value.activityId = route.params.cptId
   query.value.activityId = route.params.cptId
-  if (language.value==0) getList()
+  // if (language.value==0)
+  getList()
 })
 })
 
 
 function getList() {
 function getList() {
-  if (language.value!=0)return
+  // if (language.value!=0)return
   loading.value = true
   loading.value = true
-  booking.getActivityCarList(query.value).then(res=>{
+  booking.getActivityCarList(query.value).then(res => {
     list.value = res.rows
     list.value = res.rows
     loading.value = false
     loading.value = false
-  }).catch(e=>{
+  }).catch(e => {
     loading.value = false
     loading.value = false
   })
   })
 }
 }
-function goOrder(item,car) {
-  if(!user){
+
+function goOrder(item, car) {
+  if (!user) {
     useUserStore().setReLogin()
     useUserStore().setReLogin()
     return
     return
   }
   }
   router.push({
   router.push({
-    name:'carOrder',
-    params:{
-      id:item.id,
+    name: 'carOrder',
+    params: {
+      id: item.id,
     },
     },
-    query:{
-      item:encodeURIComponent(JSON.stringify(item)),
-      car:encodeURIComponent(JSON.stringify(car)),
+    query: {
+      item: encodeURIComponent(JSON.stringify(item)),
+      car: encodeURIComponent(JSON.stringify(car)),
     }
     }
   })
   })
 }
 }
 </script>
 </script>
 
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
+
+.hotel {
+  margin-bottom: 20px;
+  cursor: pointer;
 
 
-.hotel{margin-bottom: 20px;cursor: pointer;
-  .index{display: flex;font-weight: 500;padding-left: 20px;
-    font-size: 18px;align-items: center;
-    img{margin-left: 15px;}
+  .index {
+    display: flex;
+    font-weight: 500;
+    padding-left: 20px;
+    font-size: 18px;
+    align-items: center;
+
+    img {
+      margin-left: 15px;
+    }
   }
   }
-  p{font-weight: 500;
+
+  p {
+    font-weight: 500;
     font-size: 24px;
     font-size: 24px;
-    color: #000000;}
-  &:hover .el-card{box-shadow: 0 0 10px #aaa;}
-}
-.hotel:nth-child(7n) .index{color: #009E96;}
-.hotel:nth-child(7n+1) .index{color: #FF8124;}
-.hotel:nth-child(7n+2) .index{color: #E4007F;}
-.hotel:nth-child(7n+3) .index{color: #0068B7;}
-.hotel:nth-child(7n+4) .index{color: #32B16C;}
-.hotel:nth-child(7n+5) .index{color: #920783;}
-.hotel:nth-child(7n+6) .index{color: #00B7EE;}
-
-.banner{height: 140px;background-size: cover;text-align: center;
-  background: url("@/assets/booking/cl_bg.png") center;display: flex;align-items: center;
+    color: #000000;
+  }
+
+  &:hover .el-card {
+    box-shadow: 0 0 10px #aaa;
+  }
+}
+
+.hotel:nth-child(7n) .index {
+  color: #009E96;
+}
+
+.hotel:nth-child(7n+1) .index {
+  color: #FF8124;
+}
+
+.hotel:nth-child(7n+2) .index {
+  color: #E4007F;
+}
+
+.hotel:nth-child(7n+3) .index {
+  color: #0068B7;
+}
+
+.hotel:nth-child(7n+4) .index {
+  color: #32B16C;
+}
+
+.hotel:nth-child(7n+5) .index {
+  color: #920783;
+}
+
+.hotel:nth-child(7n+6) .index {
+  color: #00B7EE;
+}
+
+.banner {
+  height: 140px;
+  background-size: cover;
+  text-align: center;
+  background: url("@/assets/booking/cl_bg.png") center;
+  display: flex;
+  align-items: center;
   justify-content: center;
   justify-content: center;
-  img{display: block;margin:-30px auto 0;width: auto;}
-}
-.searchBar{position: relative;top: -30px;
-  background: #FFFFFF;display: flex;padding: 20px;
-  border-radius: 10px;}
-.no-border{border: none;background: #F5F7F9;
-  :deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;}
-}
-.starBox{
-  img{display: inline-block;margin-right: 4px}
-}
-.tagbox{margin: 15px 0;
-  a{color: #AFB5B9;font-size: 12px;}
-  span{border-radius: 13px;font-size: 12px;padding: 4px 10px;margin-right:10px;font-weight: 400;}
-  span:nth-child(4n){background: rgba(50, 177, 108, 0.2);color: rgba(50, 177, 108, 1);}
-  span:nth-child(4n+1){background:rgba(243, 152, 0, 0.2);color: rgba(243, 152, 0, 1);}
-  span:nth-child(4n+2){background: rgba(0, 160, 233, 0.2);color: rgba(0, 160, 233, 1);}
-  span:nth-child(4n+3){background: rgba(247, 64, 166, 0.2);color:rgba(247, 64, 166, 1);}
-}
-.name.flex{align-items: center;}
-.name .tagbox{margin: 0 0 0 15px;}
+
+  img {
+    display: block;
+    margin: -30px auto 0;
+    width: auto;
+  }
+}
+
+.searchBar {
+  position: relative;
+  top: -30px;
+  background: #FFFFFF;
+  display: flex;
+  padding: 20px;
+  border-radius: 10px;
+}
+
+.no-border {
+  border: none;
+  background: #F5F7F9;
+
+  :deep(.el-input__wrapper) {
+    border: none;
+    box-shadow: none;
+    background: #F5F7F9;
+  }
+}
+
+.starBox {
+  img {
+    display: inline-block;
+    margin-right: 4px
+  }
+}
+
+.tagbox {
+  margin: 15px 0;
+
+  a {
+    color: #AFB5B9;
+    font-size: 12px;
+  }
+
+  span {
+    border-radius: 13px;
+    font-size: 12px;
+    padding: 4px 10px;
+    margin-right: 10px;
+    font-weight: 400;
+  }
+
+  span:nth-child(4n) {
+    background: rgba(50, 177, 108, 0.2);
+    color: rgba(50, 177, 108, 1);
+  }
+
+  span:nth-child(4n+1) {
+    background: rgba(243, 152, 0, 0.2);
+    color: rgba(243, 152, 0, 1);
+  }
+
+  span:nth-child(4n+2) {
+    background: rgba(0, 160, 233, 0.2);
+    color: rgba(0, 160, 233, 1);
+  }
+
+  span:nth-child(4n+3) {
+    background: rgba(247, 64, 166, 0.2);
+    color: rgba(247, 64, 166, 1);
+  }
+}
+
+.name.flex {
+  align-items: center;
+}
+
+.name .tagbox {
+  margin: 0 0 0 15px;
+}
+
 .room {
 .room {
-  background: #FAFBFD;margin: 20px 0 0;padding: 20px;
+  background: #FAFBFD;
+  margin: 20px 0 0;
+  padding: 20px;
   border: 1px solid #E5E5E5;
   border: 1px solid #E5E5E5;
-  .name{font-size: 20px;margin: 0 0 10px;}
-  .roomImg{aspect-ratio: 16/9;border-radius: 10px;overflow: hidden;
-    img{width: 100%;object-fit: cover;object-position: center;height: 100%;}
+
+  .name {
+    font-size: 20px;
+    margin: 0 0 10px;
+  }
+
+  .roomImg {
+    aspect-ratio: 16/9;
+    border-radius: 10px;
+    overflow: hidden;
+
+    img {
+      width: 100%;
+      object-fit: cover;
+      object-position: center;
+      height: 100%;
+    }
   }
   }
-  .price{color: #FF8124;font-size: 24px;
-    span{font-size: 36px;font-family: "DIN Alternate"}
+
+  .price {
+    color: #FF8124;
+    font-size: 24px;
+
+    span {
+      font-size: 36px;
+      font-family: "DIN Alternate"
+    }
+  }
+
+  .bg-lineg {
+    margin: auto;
+    border-radius: 10px;
+    text-align: center;
+    padding: 7px 2px 2px;
+    font-size: 24px;
+    width: 66px;
+    cursor: pointer;
+
+    div {
+      background: #fff;
+      font-size: 13px;
+      border-radius: 20px;
+      padding: 0 10px;
+      color: #453DEA;
+      font-weight: 500;
     }
     }
-  .bg-lineg{margin: auto;border-radius: 10px;text-align: center;padding: 7px 2px 2px;
-    font-size: 24px;width:66px;cursor: pointer;
-    div{background: #fff;font-size: 13px;border-radius: 20px;padding: 0 10px;
-      color: #453DEA;font-weight: 500;}
   }
   }
 }
 }
 
 

@@ -8,22 +8,22 @@
             }}
             }}
           </div>
           </div>
         </div>
         </div>
-        <el-row class="pd20" :gutter="20">
+        <el-row :gutter="20" class="pd20">
           <el-col :span="14">
           <el-col :span="14">
             <div class="border-info">
             <div class="border-info">
               <div class="flex aic">
               <div class="flex aic">
                 <h3 class="esp">{{ item.checkIn }}</h3>
                 <h3 class="esp">{{ item.checkIn }}</h3>
-                <img class="w40px mlr20 " style="height: 40px;" src="@/assets/booking/wf.png"/>
+                <img class="w40px mlr20 " src="@/assets/booking/wf.png" style="height: 40px;"/>
                 <h3 class="esp">{{ item.checkOut }}</h3>
                 <h3 class="esp">{{ item.checkOut }}</h3>
               </div>
               </div>
               <div class="flex">
               <div class="flex">
-                <el-image class="w150px br10 as16_9" fit="cover" :src="fillImgUrl(car.photos?.split(',')[0])"/>
+                <el-image :src="fillImgUrl(car.photos?.split(',')[0])" class="w150px br10 as16_9" fit="cover"/>
                 <div class="ml20">
                 <div class="ml20">
                   <div class="roomType">{{ car.carType }}</div>
                   <div class="roomType">{{ car.carType }}</div>
                   <div class="tagbox">
                   <div class="tagbox">
                     <span class="tag">{{ car.carColor }}</span>
                     <span class="tag">{{ car.carColor }}</span>
-                    <span class="tag" v-show="car.checkOut==1">{{ language == 0 ?'可送车':'Can send car' }}</span>
-                    <span class="tag" v-show="car.checkIn==1">{{ language == 0 ?'可接车':'Can pick up' }}</span>
+                    <span v-show="car.checkOut==1" class="tag">{{ language == 0 ? '可送车' : 'Can send car' }}</span>
+                    <span v-show="car.checkIn==1" class="tag">{{ language == 0 ? '可接车' : 'Can pick up' }}</span>
                   </div>
                   </div>
                   <div class="room">
                   <div class="room">
                     <span>{{ language == 0 ? '座位数' : 'Seats' }}: {{ car.carSeat }}</span>
                     <span>{{ language == 0 ? '座位数' : 'Seats' }}: {{ car.carSeat }}</span>
@@ -38,86 +38,86 @@
 
 
             <div class="leftboderTT">{{ language == 0 ? '预约信息' : 'Reservation information' }}</div>
             <div class="leftboderTT">{{ language == 0 ? '预约信息' : 'Reservation information' }}</div>
             <div class="border-rr mt20 pd20">
             <div class="border-rr mt20 pd20">
-              <el-form :model="form" :label-width="language == 0 ?'120':'200'" :rules="rules" ref="formRef">
-                <el-form-item :label="language==0?'车辆数量':'cars'" required prop="num">
+              <el-form ref="formRef" :label-width="language == 0 ?'120':'200'" :model="form" :rules="rules">
+                <el-form-item :label="language==0?'车辆数量':'cars'" prop="num" required>
                   <el-input-number v-model="form.num" :min="1" @change="changecarNum"/>
                   <el-input-number v-model="form.num" :min="1" @change="changecarNum"/>
                 </el-form-item>
                 </el-form-item>
-                <el-form-item :label="language==0?'是否接送':'use Type'" required prop="useType">
+                <el-form-item :label="language==0?'是否接送':'use Type'" prop="useType" required>
                   <el-checkbox-group v-model="form.useType" @change="changeUseType">
                   <el-checkbox-group v-model="form.useType" @change="changeUseType">
-                    <el-checkbox value="0" v-if="car.checkIn == 1">
+                    <el-checkbox v-if="car.checkIn == 1" value="0">
                       {{ language == 0 ? '接站' : 'Pick up' }}
                       {{ language == 0 ? '接站' : 'Pick up' }}
                     </el-checkbox>
                     </el-checkbox>
-                    <el-checkbox value="1" v-if="car.checkOut == 1">{{ language == 0 ? '送站' : 'Drop off' }}
+                    <el-checkbox v-if="car.checkOut == 1" value="1">{{ language == 0 ? '送站' : 'Drop off' }}
                     </el-checkbox>
                     </el-checkbox>
                   </el-checkbox-group>
                   </el-checkbox-group>
                 </el-form-item>
                 </el-form-item>
 
 
                 <div v-show="form.useType?.indexOf('0')> -1">
                 <div v-show="form.useType?.indexOf('0')> -1">
-                  <h3 class="afterLine">{{ language==0?'接站信息':'Pick up information' }}</h3>
+                  <h3 class="afterLine">{{ language == 0 ? '接站信息' : 'Pick up information' }}</h3>
                   <el-form-item :label="language==0?'用车日期':'Date'" required>
                   <el-form-item :label="language==0?'用车日期':'Date'" required>
                     <el-date-picker v-model="date1" :disabled-date="disabledDate"
                     <el-date-picker v-model="date1" :disabled-date="disabledDate"
-                                    type="date"
-                                    :placeholder="language==0?'选择日期':'Select date'" format="YYYY-MM-DD"
+                                    :placeholder="language==0?'选择日期':'Select date'"
+                                    format="YYYY-MM-DD" type="date"
                                     value-format="YYYY-MM-DD"/>
                                     value-format="YYYY-MM-DD"/>
                     <!--                    :picker-options="pickerOptions"-->
                     <!--                    :picker-options="pickerOptions"-->
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'用车时间':'Time'" required>
                   <el-form-item :label="language==0?'用车时间':'Time'" required>
                     <el-time-picker
                     <el-time-picker
-                        v-model="revTime1" :start="car.operStart" :end="car.operEnd"
+                      v-model="revTime1" :end="car.operEnd" :start="car.operStart"
                       format="HH:mm" value-format="HH:mm" @change="bindTimeChange"
                       format="HH:mm" value-format="HH:mm" @change="bindTimeChange"
                     />
                     />
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'联系人':'Contacts'" required>
                   <el-form-item :label="language==0?'联系人':'Contacts'" required>
-                    <el-input type="text" v-model="form.pickUpBo.contacts"/>
+                    <el-input v-model="form.pickUpBo.contacts" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'联系电话':'Phone'" required>
                   <el-form-item :label="language==0?'联系电话':'Phone'" required>
-                    <el-input type="text" v-model="form.pickUpBo.phone"/>
+                    <el-input v-model="form.pickUpBo.phone" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'人数':'Person Count'" required>
                   <el-form-item :label="language==0?'人数':'Person Count'" required>
-                    <el-input type="text" v-model="form.pickUpBo.count"/>
+                    <el-input-number v-model="form.pickUpBo.count" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'航班/火车班次:':'Flight/Train No'" required>
                   <el-form-item :label="language==0?'航班/火车班次:':'Flight/Train No'" required>
-                    <el-input type="text" v-model="form.pickUpBo.no"/>
+                    <el-input v-model="form.pickUpBo.no" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'接机/接站地点':'Pick up/Drop off Address'" required>
                   <el-form-item :label="language==0?'接机/接站地点':'Pick up/Drop off Address'" required>
-                    <el-input type="text" v-model="form.pickUpBo.noAddress"/>
+                    <el-input v-model="form.pickUpBo.noAddress" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'送达地点':'Delivery Address'" required>
                   <el-form-item :label="language==0?'送达地点':'Delivery Address'" required>
-                    <el-input type="text" v-model="form.pickUpBo.deliveryAddress"/>
+                    <el-input v-model="form.pickUpBo.deliveryAddress" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'备注':'Remarks'">
                   <el-form-item :label="language==0?'备注':'Remarks'">
-                    <el-input type="textarea" rows="3" v-model="form.pickUpBo.remarks"/>
+                    <el-input v-model="form.pickUpBo.remarks" rows="3" type="textarea"/>
                   </el-form-item>
                   </el-form-item>
                 </div>
                 </div>
                 <div v-show="form.useType?.indexOf('1')> -1">
                 <div v-show="form.useType?.indexOf('1')> -1">
-                  <h3 class="afterLine">{{ language==0?'送站信息':'Drop off information' }}</h3>
+                  <h3 class="afterLine">{{ language == 0 ? '送站信息' : 'Drop off information' }}</h3>
                   <el-form-item :label="language==0?'用车日期':'Date'" required>
                   <el-form-item :label="language==0?'用车日期':'Date'" required>
                     <el-date-picker v-model="date2" :disabled-date="disabledDate"
                     <el-date-picker v-model="date2" :disabled-date="disabledDate"
-                                    type="date"
-                                    :placeholder="language==0?'选择日期':'Select date'" format="YYYY-MM-DD"
+                                    :placeholder="language==0?'选择日期':'Select date'"
+                                    format="YYYY-MM-DD" type="date"
                                     value-format="YYYY-MM-DD"/>
                                     value-format="YYYY-MM-DD"/>
                     <!--                    :picker-options="pickerOptions"-->
                     <!--                    :picker-options="pickerOptions"-->
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'用车时间':'Time'" required>
                   <el-form-item :label="language==0?'用车时间':'Time'" required>
                     <el-time-picker
                     <el-time-picker
-                        v-model="revTime2" :start="car.operStart" :end="car.operEnd"
+                      v-model="revTime2" :end="car.operEnd" :start="car.operStart"
                       format="HH:mm" value-format="HH:mm" @change="bindTimeChange2"
                       format="HH:mm" value-format="HH:mm" @change="bindTimeChange2"
                     />
                     />
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'联系人':'Contacts'" required>
                   <el-form-item :label="language==0?'联系人':'Contacts'" required>
-                    <el-input type="text" v-model="form.dropOffBo.contacts"/>
+                    <el-input v-model="form.dropOffBo.contacts" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'联系电话':'Phone'" required>
                   <el-form-item :label="language==0?'联系电话':'Phone'" required>
-                    <el-input type="text" v-model="form.dropOffBo.phone"/>
+                    <el-input v-model="form.dropOffBo.phone" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item label="人数" required>
                   <el-form-item label="人数" required>
-                    <el-input type="text" v-model="form.dropOffBo.count"/>
+                    <el-input v-model="form.dropOffBo.count" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item label="送达地点" required>
                   <el-form-item label="送达地点" required>
-                    <el-input type="text" v-model="form.dropOffBo.deliveryAddress"/>
+                    <el-input v-model="form.dropOffBo.deliveryAddress" type="text"/>
                   </el-form-item>
                   </el-form-item>
                   <el-form-item :label="language==0?'备注':'Remarks'">
                   <el-form-item :label="language==0?'备注':'Remarks'">
-                    <el-input type="textarea" rows="3" v-model="form.dropOffBo.remarks"/>
+                    <el-input v-model="form.dropOffBo.remarks" rows="3" type="textarea"/>
                   </el-form-item>
                   </el-form-item>
                 </div>
                 </div>
               </el-form>
               </el-form>
@@ -127,14 +127,14 @@
             <div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div>
             <div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div>
             <div class="border-rr mt20 pd20 ccitemBox">
             <div class="border-rr mt20 pd20 ccitemBox">
               <label v-show="form.useType.indexOf('0')>-1"> {{ language == 0 ? '接站车辆费' : 'Room fee' }}
               <label v-show="form.useType.indexOf('0')>-1"> {{ language == 0 ? '接站车辆费' : 'Room fee' }}
-                <span class="fr">{{language == 0 ? '¥' : '€'}}{{form.pickUpBo.total}}</span>
+                <span class="fr">{{ language == 0 ? '¥' : '€' }}{{ form.pickUpBo.total }}</span>
               </label>
               </label>
               <div v-show="form.useType.indexOf('0')>-1" class="ccitem">
               <div v-show="form.useType.indexOf('0')>-1" class="ccitem">
                 {{ car.name }}
                 {{ car.name }}
-                <span >{{form.num}} *{{ language == 0 ? '¥' : '€' }}{{ car.inPrice }}</span>
+                <span>{{ form.num }} *{{ language == 0 ? '¥' : '€' }}{{ car.inPrice }}</span>
               </div>
               </div>
               <label v-show="form.useType.indexOf('1')>-1">{{ language == 0 ? '送站车辆费' : 'Extra bed fee' }}
               <label v-show="form.useType.indexOf('1')>-1">{{ language == 0 ? '送站车辆费' : 'Extra bed fee' }}
-                <span class="fr">{{language == 0 ? '¥' : '€'}}{{ form.dropOffBo.total }}</span>
+                <span class="fr">{{ language == 0 ? '¥' : '€' }}{{ form.dropOffBo.total }}</span>
               </label>
               </label>
 
 
               <div v-show="form.useType.indexOf('1')>-1" class="ccitem">
               <div v-show="form.useType.indexOf('1')>-1" class="ccitem">
@@ -151,14 +151,18 @@
       </el-card>
       </el-card>
 
 
       <el-card class="mt30">
       <el-card class="mt30">
-        <el-row justify="space-between" align="middle">
+        <el-row align="middle" justify="space-between">
           <el-col :span="12">
           <el-col :span="12">
             <label>{{ language == 0 ? '共计金额' : 'Total' }}：
             <label>{{ language == 0 ? '共计金额' : 'Total' }}：
-              <span class=" text-warning"> {{ language == 0 ? '¥' : '€' }}<span class="bigMoney">{{ money }}</span></span>
+              <span class=" text-warning"> {{ language == 0 ? '¥' : '€' }}<span class="bigMoney">{{
+                  money
+                }}</span></span>
             </label>
             </label>
           </el-col>
           </el-col>
           <el-col :span="12" class="text-right">
           <el-col :span="12" class="text-right">
-            <el-button type="primary" class="btn-lineG w200px" @click="submit" round :loading="payLoading">{{ language == 0 ?'确认付款':'Pay' }}</el-button>
+            <el-button :loading="payLoading" class="btn-lineG w200px" round type="primary" @click="submit">
+              {{ language == 0 ? '确认付款' : 'Pay' }}
+            </el-button>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
       </el-card>
       </el-card>
@@ -175,6 +179,7 @@ import {checkResidueRoom, getBaseInfoByActiveId, newsSubmitOrderHotel, submitOrd
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
 import {ElMessage, ElMessageBox} from "element-plus";
 import {ElMessage, ElMessageBox} from "element-plus";
 import useUserStore from "@/store/modules/user";
 import useUserStore from "@/store/modules/user";
+
 const payLoading = ref(false)
 const payLoading = ref(false)
 const user = useUserStore().user
 const user = useUserStore().user
 const language = useStorage('language', 0)
 const language = useStorage('language', 0)
@@ -189,11 +194,11 @@ const date2 = ref('')
 const form = ref({
 const form = ref({
   num: 1,
   num: 1,
   pickUpBo: {
   pickUpBo: {
-    carsList:[],
+    carsList: [],
     total: 0
     total: 0
   },
   },
   dropOffBo: {
   dropOffBo: {
-    carsList:[],
+    carsList: [],
     total: 0
     total: 0
   },
   },
   useType: []
   useType: []
@@ -224,10 +229,19 @@ function changecarNum(e) {
   var m1 = 0
   var m1 = 0
   var m2 = 0
   var m2 = 0
   if (form.value.useType.indexOf('0') > -1) {
   if (form.value.useType.indexOf('0') > -1) {
+    if (language.value == 0) {
       m1 = form.value.num * car.value.inPrice
       m1 = form.value.num * car.value.inPrice
+    } else {
+      m1 = form.value.num * car.value.inPriceEn
+    }
   }
   }
   if (form.value.useType.indexOf('1') > -1) {
   if (form.value.useType.indexOf('1') > -1) {
+    if (language.value == 0) {
       m2 = form.value.num * car.value.outPrice
       m2 = form.value.num * car.value.outPrice
+    } else {
+      m2 = form.value.num * car.value.outPriceEn
+
+    }
   }
   }
   form.value.pickUpBo.total = m1.toFixed(2)
   form.value.pickUpBo.total = m1.toFixed(2)
   form.value.dropOffBo.total = m2.toFixed(2)
   form.value.dropOffBo.total = m2.toFixed(2)
@@ -243,21 +257,24 @@ function bindTimeChange(e) {
 function bindTimeChange2(e) {
 function bindTimeChange2(e) {
   revTime2.value = e
   revTime2.value = e
 }
 }
+
 function initDays() {
 function initDays() {
-  getBaseInfoByActiveId(route.params.cptId).then(res=>{
+  getBaseInfoByActiveId(route.params.cptId).then(res => {
     lform.value = res.data
     lform.value = res.data
-  }).catch(err=>{
+  }).catch(err => {
     console.log(err)
     console.log(err)
   })
   })
 }
 }
+
 function disabledDate(date) {
 function disabledDate(date) {
   // const today = dayjs().format('YYYY-MM-DD')
   // const today = dayjs().format('YYYY-MM-DD')
   if (lform.value.carStart) {
   if (lform.value.carStart) {
-    return (date.getTime() < dayjs(lform.value.carStart).valueOf())||(date.getTime() > dayjs(lform.value.carEnd).valueOf())
+    return (date.getTime() < dayjs(lform.value.carStart).valueOf()) || (date.getTime() > dayjs(lform.value.carEnd).valueOf())
 
 
   }
   }
   return true
   return true
 }
 }
+
 function submit() {
 function submit() {
   if (!user) {
   if (!user) {
     useUserStore().setReLogin()
     useUserStore().setReLogin()
@@ -276,6 +293,7 @@ function submit() {
     pushFrom()
     pushFrom()
   })
   })
 }
 }
+
 function pushFrom() {
 function pushFrom() {
   payLoading.value = true
   payLoading.value = true
   var obj = {
   var obj = {
@@ -314,15 +332,15 @@ function pushFrom() {
   form.value.lavId = item.value.id
   form.value.lavId = item.value.id
   form.value.checkIn = item.value.checkIn
   form.value.checkIn = item.value.checkIn
   form.value.checkOut = item.value.checkOut
   form.value.checkOut = item.value.checkOut
-  submitOrderCar(form.value).then(res=>{
+  submitOrderCar(form.value).then(res => {
     payLoading.value = false
     payLoading.value = false
     if (res.data && res.data.total != -100) {
     if (res.data && res.data.total != -100) {
       router.push({
       router.push({
         name: 'bookingPay',
         name: 'bookingPay',
         query: {
         query: {
-          orderId:res.data.orderId,
-          money:res.data.total,
-          type:'car'
+          orderId: res.data.orderId,
+          money: res.data.total,
+          type: 'car'
         }
         }
       })
       })
     } else {
     } else {
@@ -332,7 +350,7 @@ function pushFrom() {
 }
 }
 </script>
 </script>
 
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .bigMoney {
 .bigMoney {
   font-size: 36px !important;
   font-size: 36px !important;
   font-family: 'DIN Alternate';
   font-family: 'DIN Alternate';

@@ -196,9 +196,9 @@
                       {{ form.pickUpBo.noAddress }}
                       {{ form.pickUpBo.noAddress }}
                     </div>
                     </div>
                     <div>{{ language == 0 ? '送达地点' : 'Delivery Place' }}： {{ form.pickUpBo.deliveryAddress }}</div>
                     <div>{{ language == 0 ? '送达地点' : 'Delivery Place' }}： {{ form.pickUpBo.deliveryAddress }}</div>
-                    <div>{{ language == 0 ? '联系人' : 'Contact Person' }}：{{ form.dropOffBo.contacts }}</div>
-                    <div>{{ language == 0 ? '联系电话' : 'Contact Phone' }}：{{ form.dropOffBo.phone }}</div>
-                    <div>{{ language == 0 ? '备注' : 'Remarks' }}：{{ form.dropOffBo.remarks || '-' }}</div>
+                    <div>{{ language == 0 ? '联系人' : 'Contact Person' }}：{{ form.pickUpBo.contacts }}</div>
+                    <div>{{ language == 0 ? '联系电话' : 'Contact Phone' }}：{{ form.pickUpBo.phone }}</div>
+                    <div>{{ language == 0 ? '备注' : 'Remarks' }}：{{ form.pickUpBo.remarks || '-' }}</div>
                   </div>
                   </div>
                 </el-col>
                 </el-col>
                 <el-col v-if="form.dropOffBo?.revTime" :lg="12" :md="12" :sm="12" :xs="24">
                 <el-col v-if="form.dropOffBo?.revTime" :lg="12" :md="12" :sm="12" :xs="24">

+<template>
+  <div class="collapsebox">
+    <div class="pd20">
+      <div class="fl mb20" style="display: flex;">
+        <el-input
+          v-model.trim="query.text"
+          :placeholder="language==0?'请输入邮箱或联系方式':'Please enter email or contact information'"
+          :prefix-icon="Search"
+          clearable
+          size="small"
+          style="width: 260px"/>
+        <el-button size="small" style="margin-left: 20px" type="primary" @click="getList">
+          {{ language == 0 ? '查询' : 'SEARCH' }}
+        </el-button>
+      </div>
+      <el-table :data="list" border>
+        <el-table-column :label="language==0?'序号':'Serial'" :min-width="language==0?60:80" align="center"
+                         type="index"/>
+        <el-table-column :label="language==0?'服务类型':'Type Of Service'" :min-width="language==0? 90:150"
+                         align="center"
+                         prop="serviceTypeStr">
+          <template #default="{row}">
+            {{ row.serviceType == 1 ? language == 0 ? '接机' : 'Pick-up' : language == 0 ? '送机' : 'Drop-off' }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" prop="name" width="110">
+        </el-table-column>
+        <el-table-column :label="language==0?'联系方式':'Contact Way'" :min-width="language==0?100:130" align="center"
+                         prop="phone">
+        </el-table-column>
+        <el-table-column :label="language==0?'抵达时间':'Time Of Arrival'" align="center" width="180">
+          <template #default="{row}">
+            {{ row.arrivalDate + ' ' + row.arrivaTime }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="language==0?'人数':'Number Of People'" :min-width="language==0?120:170" align="center"
+                         prop="counts">
+        </el-table-column>
+        <el-table-column :label="language==0?'航班 / 车次':'Flight / train number'" :min-width="language==0?120:190"
+                         align="center"
+                         prop="flight">
+        </el-table-column>
+        <el-table-column :label="language==0?'机场 / 火车站':'Airport / Train station'" :min-width="language==0?120:200"
+                         align="center"
+                         prop="stationName">
+        </el-table-column>
+        <el-table-column :label="language==0?'航站楼':'Terminal'" align="center" prop="terminal" width="160">
+        </el-table-column>
+        <el-table-column :label="language==0?'出发地':' Place Of Departure'" :min-width="language==0?120:200"
+                         align="center" prop="hotle">
+          <template #default="{row}">
+            {{ row.serviceType != 1 ? row.hotle : row.stationName }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="language==0?'目的地':'Destination'" :min-width="language==0?120:200"
+                         align="center" prop="hotle">
+          <template #default="{row}">
+            {{ row.serviceType == 1 ? row.hotle : row.stationName }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <PaginationPc
+        v-show="total>0"
+        v-model:limit="query.pageSize"
+        v-model:page="query.pageNum"
+        :total="total"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {Search} from "@element-plus/icons-vue";
+import {useStorage} from "@vueuse/core/index"
+import {aircraft} from "@/apiPc/match";
+import PaginationPc from "@/components/PaginationPc";
+import {useRoute} from 'vue-router'
+
+const language = useStorage('language', 0)
+const list = ref([])
+const total = ref(0)
+const route = useRoute()
+const query = ref({
+  text: '',
+  pageSize: 10,
+  pageNum: 1,
+  cptId: route.query.matchId
+})
+
+function getList() {
+  aircraft(query.value).then(res => {
+    list.value = res
+    total.value = res.total
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.table {
+  width: 100%;
+  border-left: 1px solid #e1e1e1;
+  border-top: 1px solid #e1e1e1;
+
+  th {
+    background: #eee;
+    padding: 6px 10px;
+    text-transform: uppercase;
+    border-right: 1px solid #e1e1e1;
+    border-bottom: 1px solid #e1e1e1;
+    font-size: 15px;
+  }
+
+  td {
+    padding: 6px 10px;
+    border-right: 1px solid #e1e1e1;
+    font-size: 15px;
+    border-bottom: 1px solid #e1e1e1;
+    vertical-align: middle;
+    text-align: center;
+
+    span {
+      margin-right: 10px
+    }
+
+    span::after {
+      content: ','
+    }
+
+    span:last-child::after {
+      content: ''
+    }
+  }
+}
+</style>

+<template>
+  <div class="collapsebox">
+    <div class="pd20">
+      <div class="fl mb20" style="display: flex;">
+        <el-input
+          v-model.trim="query.text"
+          :placeholder="language==0?'请输入邮箱或联系方式':'Please enter email or contact information'"
+          :prefix-icon="Search"
+          clearable
+          size="small"
+          style="width: 260px;"/>
+        <el-button size="small" style="margin-left: 20px" type="primary" @click="getList">
+          {{ language == 0 ? '查询' : 'SEARCH' }}
+        </el-button>
+      </div>
+      <el-table :data="list" border>
+        <el-table-column :label="language==0?'序号':'Serial'" :min-width="language==0?60:80" align="center"
+                         type="index"/>
+        <el-table-column :label="language==0?'酒店名称':'Hotel Name'" align="center" min-width="150"
+                         prop="hotelName"></el-table-column>
+        <el-table-column :label="language==0?'联系人':'Contacts'" align="center" min-width="110" prop="contacts">
+        </el-table-column>
+        <el-table-column :label="language==0?'联系方式':'Contact Way'" align="center" prop="phone"
+                         width="120">
+        </el-table-column>
+
+        <el-table-column :label="language==0?'预留日期':'Reservation Date'" align="center" min-width="120"
+                         prop="reservationDate">
+        </el-table-column>
+        <el-table-column :label="language==0?'房型':'Room Type'" :min-width="isNational?120:240" align="center"
+                         prop="roomType">
+        </el-table-column>
+        <el-table-column :label="language==0?'数量':'Quantity'" align="center" prop="num" width="160">
+        </el-table-column>
+        <el-table-column :label="language==0?'状态':'State'" align="center" prop="status" width="160">
+          <template #default="{row}">
+            {{ language == 0 ? '已预留' : 'Reserved' }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <PaginationPc
+        v-show="total>0"
+        v-model:limit="query.pageSize"
+        v-model:page="query.pageNum"
+        :total="total"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {Search} from "@element-plus/icons-vue";
+import {useStorage} from "@vueuse/core/index"
+import {hotelList} from "@/apiPc/match";
+import PaginationPc from "@/components/PaginationPc";
+import {useRoute} from 'vue-router'
+
+const language = useStorage('language', 0)
+const list = ref([])
+const total = ref(0)
+const route = useRoute()
+const query = ref({
+  projectName: '',
+  pageSize: 10,
+  pageNum: 1,
+  activeId: route.query.matchId
+})
+
+function getList() {
+  // query.value.text = encodeURIComponent(query.value.text1)
+  hotelList(query.value).then(res => {
+    list.value = res
+    total.value = res.total
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.table {
+  width: 100%;
+  border-left: 1px solid #e1e1e1;
+  border-top: 1px solid #e1e1e1;
+
+  th {
+    background: #eee;
+    padding: 6px 10px;
+    text-transform: uppercase;
+    border-right: 1px solid #e1e1e1;
+    border-bottom: 1px solid #e1e1e1;
+    font-size: 15px;
+  }
+
+  td {
+    padding: 6px 10px;
+    border-right: 1px solid #e1e1e1;
+    font-size: 15px;
+    border-bottom: 1px solid #e1e1e1;
+    vertical-align: middle;
+    text-align: center;
+
+    span {
+      margin-right: 10px
+    }
+
+    span::after {
+      content: ','
+    }
+
+    span:last-child::after {
+      content: ''
+    }
+  }
+}
+</style>

 <template>
 <template>
   <div style="filter: opacity(1)">
   <div style="filter: opacity(1)">
-    <el-row :gutter="14" v-if="language==0">
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+    <el-row v-if="language==0" class="btnbox" justify='space-between'>
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(0)">
         <div class="funcBtn" @click="popRemark(0)">
           <img src="@/assets/dance/btn04.png"/>
           <img src="@/assets/dance/btn04.png"/>
           <h4>票务预订</h4>
           <h4>票务预订</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(1)">
         <div class="funcBtn" @click="popRemark(1)">
           <img src="@/assets/dance/btn01.png"/>
           <img src="@/assets/dance/btn01.png"/>
           <h4>酒店预订</h4>
           <h4>酒店预订</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(2)">
         <div class="funcBtn" @click="popRemark(2)">
           <img src="@/assets/dance/btn02.png"/>
           <img src="@/assets/dance/btn02.png"/>
           <h4>车辆预订</h4>
           <h4>车辆预订</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
+        <div class="funcBtn" @click="popRemark(6)">
+          <img src="@/assets/dance/btn07.png"/>
+          <h4>预订查询</h4>
+        </div>
+      </el-col>
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(3)">
         <div class="funcBtn" @click="popRemark(3)">
           <img src="@/assets/dance/btn03.png"/>
           <img src="@/assets/dance/btn03.png"/>
           <h4>餐饮预订</h4>
           <h4>餐饮预订</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(4)">
         <div class="funcBtn" @click="popRemark(4)">
           <img src="@/assets/dance/btn05.png"/>
           <img src="@/assets/dance/btn05.png"/>
           <h4>化妆预约</h4>
           <h4>化妆预约</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(5)">
         <div class="funcBtn" @click="popRemark(5)">
           <img src="@/assets/dance/btn06.png"/>
           <img src="@/assets/dance/btn06.png"/>
           <h4>拍照预约</h4>
           <h4>拍照预约</h4>
         </div>
         </div>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
-    <el-row :gutter="14" v-else>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+    <el-row v-else class="btnbox" justify='space-between'>
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(0)">
         <div class="funcBtn" @click="popRemark(0)">
           <img src="@/assets/dance/btn04.png"/>
           <img src="@/assets/dance/btn04.png"/>
           <h4>TICKET BOOKING</h4>
           <h4>TICKET BOOKING</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(1)">
         <div class="funcBtn" @click="popRemark(1)">
           <img src="@/assets/dance/btn01.png"/>
           <img src="@/assets/dance/btn01.png"/>
           <h4>HOTEL RESERVATION</h4>
           <h4>HOTEL RESERVATION</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(2)">
         <div class="funcBtn" @click="popRemark(2)">
           <img src="@/assets/dance/btn02.png"/>
           <img src="@/assets/dance/btn02.png"/>
           <h4>TRANSPORTATION RESERVATION</h4>
           <h4>TRANSPORTATION RESERVATION</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
+        <div class="funcBtn" @click="popRemark(6)">
+          <img src="@/assets/dance/btn07.png"/>
+          <h4>RESERVATION SEARCH</h4>
+        </div>
+      </el-col>
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(3)">
         <div class="funcBtn" @click="popRemark(3)">
           <img src="@/assets/dance/btn03.png"/>
           <img src="@/assets/dance/btn03.png"/>
           <h4>DINING RESERVATION</h4>
           <h4>DINING RESERVATION</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(4)">
         <div class="funcBtn" @click="popRemark(4)">
           <img src="@/assets/dance/btn05.png"/>
           <img src="@/assets/dance/btn05.png"/>
           <h4>MAKEUP APPOINTMENT</h4>
           <h4>MAKEUP APPOINTMENT</h4>
         </div>
         </div>
       </el-col>
       </el-col>
-      <el-col :lg="4" :md="8" :sm="12" :xs="12">
+      <el-col :lg="3" :md="7" :sm="11" :xs="11">
         <div class="funcBtn" @click="popRemark(5)">
         <div class="funcBtn" @click="popRemark(5)">
           <img src="@/assets/dance/btn06.png"/>
           <img src="@/assets/dance/btn06.png"/>
           <h4>PHOTOGRAPHY APPOINTMENT</h4>
           <h4>PHOTOGRAPHY APPOINTMENT</h4>
@@ -79,10 +91,10 @@
   </div>
   </div>
   <order-remark ref="orderRemarkRef" @submit="goBooking"/>
   <order-remark ref="orderRemarkRef" @submit="goBooking"/>
 
 
-<!--  <div class="fixedKP" @click="addInvoice">-->
-<!--    <img src="@/assets/img/kp.svg"/>-->
-<!--    开票-->
-<!--  </div>-->
+  <!--  <div class="fixedKP" @click="addInvoice">-->
+  <!--    <img src="@/assets/img/kp.svg"/>-->
+  <!--    开票-->
+  <!--  </div>-->
 </template>
 </template>
 
 
 <script setup>
 <script setup>
@@ -122,10 +134,19 @@ onMounted(() => {
 
 
 function building() {
 function building() {
   ElMessage.warning(language.value == 0 ? '感谢您对本次比赛的关注，该服务暂无可预订信息，敬请期待。' : 'Thank you for your attention to this competition. The service is currently unavailable for booking. Please stay tuned.')
   ElMessage.warning(language.value == 0 ? '感谢您对本次比赛的关注，该服务暂无可预订信息，敬请期待。' : 'Thank you for your attention to this competition. The service is currently unavailable for booking. Please stay tuned.')
-  return
+
 }
 }
 
 
 function popRemark(type) {
 function popRemark(type) {
+  if (type == 6) {
+    return router.push({
+      path: '/match/list/reservationSearch',
+      query: {
+        matchId: props.matchId,
+      }
+    })
+  }
+
   if (!form.value) {
   if (!form.value) {
     building()
     building()
     return
     return
@@ -135,10 +156,9 @@ function popRemark(type) {
     || (form.value.isCarView == 0 && type == '2')
     || (form.value.isCarView == 0 && type == '2')
     || (form.value.isFoodView == 0 && type == '3')
     || (form.value.isFoodView == 0 && type == '3')
     || (form.value.isMealView == 0 && type == '4')
     || (form.value.isMealView == 0 && type == '4')
-      || (form.value.isPhotoView == 0&&type == '5')
-      || (form.value.isTicket==0 &type == '0')
-  )
-  {
+    || (form.value.isPhotoView == 0 && type == '5')
+    || (form.value.isTicket == 0 && type == '0')
+  ) {
     building()
     building()
     return
     return
   }
   }
@@ -184,7 +204,7 @@ function goBooking(n) {
   }
   }
 }
 }
 
 
-function addInvoice(){
+function addInvoice() {
   router.push({
   router.push({
     name: 'invoice',
     name: 'invoice',
     query: {
     query: {
@@ -194,15 +214,38 @@ function addInvoice(){
 }
 }
 </script>
 </script>
 
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 h4 {
 h4 {
   padding: 0 10px;
   padding: 0 10px;
 }
 }
-.fixedKP{position: fixed;background: linear-gradient(-90deg, #8623FC, #453DEA);left: 0;
-  top:450px;cursor: pointer;
-  color: #fff;border-radius: 50%;width: 60px;height: 60px;text-align: center;
-  img{width: 26px;height: 26px;display: block;margin:10px auto 0px;}
+
+//.btnbox {
+//  .el-col-lg-4 {
+//    max-width: 14.28%;
+//    flex: 0 0 14.28%;
+//  }
+//}
+
+.fixedKP {
+  position: fixed;
+  background: linear-gradient(-90deg, #8623FC, #453DEA);
+  left: 0;
+  top: 450px;
+  cursor: pointer;
+  color: #fff;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+
+  img {
+    width: 26px;
+    height: 26px;
+    display: block;
+    margin: 10px auto 0px;
+  }
+
   font-size: 13px;
   font-size: 13px;
-  box-shadow: 0 0 10px rgba(0,0,0,0.6);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.6);
 }
 }
 </style>
 </style>

+<template>
+  <div class="box mb20">
+    <el-card :body-style="{'padding':'0'}">
+      <div class="lineHead">
+        <ul>
+          <li v-for="(l,i) in menu" :key="l.name" :class="active==i?'active':''" @click="changeMenu(l,i)">
+            {{ language == 0 ? l.cn : l.en }}
+          </li>
+        </ul>
+      </div>
+
+      <HotTable v-if="active==0"/>
+      <AirportPickupTable v-if="active==1"/>
+    </el-card>
+
+  </div>
+</template>
+<script lang="ts" setup>
+import {useStorage} from "@vueuse/core/index";
+import HotTable from '@/viewsPc/match/components/hotTable.vue'
+import AirportPickupTable from '@/viewsPc/match/components/airportPickupTable.vue'
+
+const language = useStorage('language', 0)
+const active = ref(0)
+const menu = ref([
+  {cn: '酒店预订查询', active: 0, en: 'Hotel Reservation Summary'},
+  {cn: '接送机预订查询', active: 1, en: 'Transfer Reservation Summary'}
+])
+
+
+function changeMenu(v, i) {
+  active.value = i
+}
+</script>
+
+<style lang="scss" scoped>
+.box {
+  width: 1600px;
+  margin-top: 40px;
+}
+</style>