Merge branch 'devmatch' into 中分支

# Conflicts:
#	src/viewsPc/index.vue
#	src/viewsPc/index_en.vue
#	src/viewsPc/match/detail_en.vue
#	vite.config.js

@@ -33,6 +33,7 @@ export function getExamRegionsList() {
     method: 'get'
   })
 }
+
 export function getIndexScheduleList(params) {
   return request({
     url: '/league/competitionSchedule/getIndexScheduleList',
@@ -40,6 +41,7 @@ export function getIndexScheduleList(params) {
     params: params
   })
 }
+
 export function newbilllist(query) {
   return request({
     url: `/ota/norder/list`,
@@ -55,6 +57,7 @@ export function vistorRegister(data) {
     data: data
   })
 }
+
 export function upgradePersonal(data) {
   return request({
     url: `/upgradeAccountToSingle`,
@@ -62,6 +65,7 @@ export function upgradePersonal(data) {
     data: data
   })
 }
+
 export function upgradeTeam(data) {
   return request({
     url: `/upgradeAccountToTeam`,
@@ -77,6 +81,7 @@ export function submitMasterApply(data) {
     data: data
   })
 }
+
 export function masterClassList(query) {
   return request({
     // url: `/league/courseItem/list`,
@@ -85,6 +90,7 @@ export function masterClassList(query) {
     params: query
   })
 }
+
 export function getByCard(query) {
   return request({
     url: `/league/courseUser/getByCard`,
@@ -92,6 +98,7 @@ export function getByCard(query) {
     params: query
   })
 }
+
 export function getMasterApply(query) {
   return request({
     url: `/league/courseUser/getCourseByUser`,
@@ -99,12 +106,14 @@ export function getMasterApply(query) {
     params: query
   })
 }
+
 export function delByCard(card) {
   return request({
     url: `/league/courseUser/delByCard?card=${card}`,
     method: 'delete'
   })
 }
+
 export function addPickup(data) {
   return request({
     url: `/league/pickup`,
@@ -112,27 +121,31 @@ export function addPickup(data) {
     data
   })
 }
+
 export function getBackNumber(qy) {
   return request({
-    url: `/league/backNumber/query`,
+    url: `/league/backNumber/query/${qy.cptId}`,
     method: 'get',
     params: qy
   })
 }
+
 export function getTeamBackNumber(qy) {
   return request({
-    url: `/league/backNumber/teamQuery`,
+    url: `/league/backNumber/teamQuery/${qy.cptId}`,
     method: 'get',
     params: qy
   })
 }
+
 export function getTeamBackNumberPre(qy) {
   return request({
-    url: `/league/backNumber/teamQueryPre`,
+    url: `/league/backNumber/teamQueryPre/${qy.cptId}`,
     method: 'get',
     params: qy
   })
 }
+
 export function getqySchedule(qy) {
   return request({
     url: `/league/schedule/querySchedule`,
@@ -140,6 +153,7 @@ export function getqySchedule(qy) {
     params: qy
   })
 }
+
 export function getqySchedule2(qy) {
   return request({
     url: `/league/schedule/querySchedule2`,
@@ -147,6 +161,7 @@ export function getqySchedule2(qy) {
     params: qy
   })
 }
+
 export function getquerySchedule2Pre(qy) {
   return request({
     url: `/league/schedule/querySchedule2Pre`,
@@ -154,9 +169,10 @@ export function getquerySchedule2Pre(qy) {
     params: qy
   })
 }
+
 export function queryScheduleSingle(qy) {
   return request({
-    url: `/league/schedule/queryScheduleSingle`,
+    url: `/league/schedule/queryScheduleSingle/${qy.cptId}`,
     method: 'get',
     params: qy
   })

@@ -381,7 +381,15 @@
                 </div>
               </el-col>
               <el-col :lg="24">
-                <div class="text-center" />
+                <el-link
+                  v-if="(form.viewStatus=='1'||form.viewStatus=='5')&&language!=0" type="primary"
+                  @click="exportPdf"
+                >
+                  <el-icon>
+                    <Upload />
+                  </el-icon>
+                  {{ language == 0 ? '导出酒店预订单' : 'Export PDF' }}
+                </el-link>
               </el-col>
             </el-row>
           </div>

@@ -20,43 +20,12 @@
               <label class="blueTag">{{ paymentType != 3 ? '票务订单' : 'Ticket' }}</label>
               <h3>{{ matchForm.name }}</h3>
               <div>
-                <p>地址：{{ matchForm.address }}</p>
-                <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
-                <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p>
-                <p>通票：{{
-                  paymentType != 3 ? '¥' : '€'
-                }}
-                  {{
-                    paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
-                  }}
-                  /1张</p>
-                <p>优惠票：{{
-                  paymentType != 3 ? '¥' : '€'
-                }}
-                  {{
-                    paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
-                  }}
-                  /1张</p>
-                
-                <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
+                <p>票档：{{ ticketForm.extJson?.atName }}</p>
+                <p>场馆：{{ ticketForm.extJson?.atsName }}</p>
+                <p>场次：{{ ticketForm.extJson?.sessionType =='1000'? '日间场' : '夜间场' }}</p>
+                <p>票型：{{ ticketForm.extJson?.atstName }}</p>
               </div>
               <div>
-                <el-row v-for="v in message" style="width: 100%">
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    <div>{{ v.name }}
-                    </div>
-                  </el-col>
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    <div>{{ !v.discount ? '通票' : '优惠票' }}
-                    </div>
-                  </el-col>
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    {{
-                      !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
-                    }}
-                    {{ paymentType != 3 ? '￥' : '€' }}/张
-                  </el-col>
-                </el-row>
                 <el-row style="width: 100%">
                   <el-col :lg="8" :md="12" :sm="12" :xs="24">
                     <div>购票数量：{{ ticketForm.num }}张
@@ -65,8 +34,8 @@
                   <el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
                   </el-col>
                   <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    共计:{{ (totalMoney * 1).toFixed(2) }}{{
-                      paymentType != 3 ? '￥' : '€'
+                    共计:{{ (totalMoney*1).toFixed(2) }}{{
+                      paymentType == 1 ? '￥' : '€'
                     }}
                   </el-col>
                 </el-row>
@@ -82,7 +51,7 @@
                 class="mw500"
               >
                 <el-form-item :label="language==0 ?'开票金额':'Amount'">
-                  <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
+                  <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ paymentType != 3?ticketForm.total:ticketForm.totalEn }}</span>
                 </el-form-item>
 
                 <el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
@@ -248,16 +217,16 @@ async function getTickInfo() {
   ticketForm.value = res.data
   try {
     ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
-    ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
-    ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
-    cptId = ticketForm.value.extJson.ticketDate.activityId
-    totalMoney.value.val = ticketForm.value.extJson.total
-    message.value = JSON.parse(ticketForm.value.extJson.message)
-    console.log(message.value)
+    // ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
+    // ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
+    cptId = ticketForm.value.activeId
+    totalMoney.value = ticketForm.value.paymentType != 3 ? ticketForm.value.total : ticketForm.value.totalEn
+    // message.value = JSON.parse(ticketForm.value.extJson.message)
+    // console.log(message.value)
     paymentType.value = ticketForm.value.paymentType
-    totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total
-    await getDetail(ticketForm.value.extJson.ticketDate.activityId)
-    console.log(ticketForm.value)
+
+    await getDetail(ticketForm.value.activeId)
+    // console.log(ticketForm.value)
   } catch (e) {
     console.log(e)
   } finally {
@@ -268,7 +237,7 @@ async function getTickInfo() {
 async function getDetail(activeId) {
   const res = await getTicketInfoByActivityId({ activityId: activeId })
   matchForm.value = res.data
-  console.log(matchForm.value)
+  // console.log(matchForm.value)
 }
 
 function getList() {

@@ -316,7 +316,7 @@ async function customerList() {
 // 提交
 async function paymentHandle() {
   if (!user.value) {
-    useStore().setVisitor()
+    useStore.setVisitor()
     return
   }
 

@@ -74,6 +74,8 @@
                 :key="index"
                 :class="[
                   it.id == selectForm.latId ? 'tagActive' : 'tag',
+                  it.overdueView=='0' ? 'forbid' : '',
+                  (it.ticketPackage==1 && overdueView=='0') ?'forbid':''
                 ]"
                 @click="select(it)"
               >
@@ -151,17 +153,6 @@
             <div class="label">
               {{ triggerLanguage(language, "票型", "Ticket Type") }} :
             </div>
-            <div>
-              <!--              <span-->
-              <!--                v-if="currTick?.images"-->
-              <!--                style="color: #493ceb;cursor:pointer;font-weight:600;font-size: 14px"-->
-              <!--                @click="showUrl=currTick.images;show=true"-->
-              <!--              > <span style="color: red;font-size: 18px">*</span>-->
-              <!--                {{-->
-              <!--                  language == 0 ? '点击查看区域布局' : 'View Area Layout'-->
-              <!--                }}-->
-              <!--              </span>-->
-            </div>
           </div>
           <div class="select_item_box">
             <div class="select_item">
@@ -219,21 +210,26 @@
           </div>
 
           <div
-            v-if="endTime<=0" class="btn" style="margin-left: 40px;opacity: 0.5;cursor: not-allowed;margin-top: 10px"
-            @click="toSelectClosed"
+            v-if="isOver" class="btn"
+            style="margin-left: 40px;opacity: 0.5;cursor: not-allowed;margin-top: 10px"
           >
             {{
               triggerLanguage(language, "售票结束", "Sale closed")
             }}
           </div>
+          <template v-else>
+            <div v-if="leftCount<=0 && leftCount!=-999" class="btn" style="margin-left: 40px;margin-top: 10px">
+              {{
+                triggerLanguage(language, "票已售罄", "Sale out")
+              }}
+            </div>
             <div v-else class="btn" style="margin-left: 40px;margin-top: 10px" @click="toSelectSeat()">
               {{
                 triggerLanguage(language, "立即购票", "Buy tickets now")
               }}
             </div>
-        
+          </template>
         </div>
-      
       </div>
     </div>
 
@@ -263,25 +259,27 @@
 
 
 <script setup>
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch, getCurrentInstance } from 'vue'
 import {
   getTicketInfoByActivityId,
   getTicketListApi,
   checkNonPayment,
   getStadiumList,
   getActivityTypeVoListByLatsId,
-  getBaseInfoByActiveId
+  getBaseInfoByActiveId, getListByAtstId
 } from '@/apiPc/booking'
+import _ from 'lodash'
+
 
 import { dayjs } from 'element-plus'
 import { ElMessageBox } from 'element-plus'
 import { getDayName } from '@/viewsPc/seat/utils/language'
-import { fillImgUrl } from '/@/utils/ruoyi'
+import { fillImgUrl, triggerLanguage } from '/@/utils/ruoyi'
 import useUserStore from '/@/store/modules/user'
-import { triggerLanguage } from '@/utils/ruoyi'
 import { useStorage } from '@vueuse/core/index'
 import { useRoute, useRouter } from 'vue-router'
 
+const { proxy } = getCurrentInstance()
 const language = useStorage('language', 0)
 const useStore = useUserStore()
 const user = computed(() => useUserStore().user)
@@ -291,9 +289,6 @@ const show = ref(false)
 const showUrl = ref('')
 const activeId = ref(route.params.activeId)
 const active = ref(1)
-const props = defineProps({
-  activityId: [String, Number]
-})
 const remarks = ref()
 const timeData = ref()
 const endTime = ref()
@@ -312,6 +307,9 @@ const tickList = ref([])
 const currVenue = ref(null)
 const currTick = ref(null)
 const matchData = ref({})
+const overdueView = ref('1')
+const isOver = ref(false)
+const leftCount = ref(-999)
 
 watch(show, (val) => {
   if (!val) {
@@ -325,7 +323,7 @@ getDetail()
 async function getDetail() {
   const res = await getTicketInfoByActivityId({ activityId: activeId.value })
   matchForm.value = res.data
-  console.log(res)
+  // console.log(res)
   const today = dayjs().format('YYYY-MM-DD HH:mm:ss')
   timeData.value = dayjs(res.data.ticketStart).diff(today, 'millisecond')
   endTime.value = dayjs(res.data.ticketEnd).diff(today, 'millisecond')
@@ -341,9 +339,18 @@ async function getTicketList() {
     activityId: activeId.value, status: 1
   })
   tickClass.value = res.rows
-  if (tickClass.value.length > 0) {
-    selectForm.value.latId = tickClass.value?.[0]?.id
+
+  if (_.some(tickClass.value, (item) => item.overdueView == '0')
+  ) {
+    overdueView.value = '0'
+  }
+
+  const item = _.find(tickClass.value, (item) => item.overdueView == '1')
+  if (item) {
+    selectForm.value.latId = item.id
     await getVenueList()
+  } else {
+    isOver.value = true
   }
 }
 
@@ -362,14 +369,13 @@ async function getTicketListType() {
   const res = await getActivityTypeVoListByLatsId({ latsId: selectForm.value.latsId })
   tickList.value = res.data
   selectForm.value.sessionType = Object.keys(res.data)[0]
-  console.log(tickList.value)
-  // currTick.value = tickList.value[selectForm.value.sessionType][0]
-  // selectForm.value.latstId = currTick.value?.id
-  // selectForm.value.price = currTick.value?.price
-  // selectForm.value.priceEn = currTick.value?.priceEn
 }
 
 function select(v) {
+  if (v.id == selectForm.value.latId) {
+    return
+  }
+
   selectForm.value.latId = v.id
   selectForm.value.latsId = null
   selectForm.value.sessionType = null
@@ -377,11 +383,16 @@ function select(v) {
   selectForm.value.id = null
   selectForm.value.price = '--'
   selectForm.value.priceEn = '--'
+  currTick.value = null
 
   getVenueList()
 }
 
 function selectVenue(v) {
+  if (v.id == selectForm.value.latsId) {
+    return
+  }
+
   currVenue.value = v
   selectForm.value.latsId = v.id
   selectForm.value.sessionType = null
@@ -390,27 +401,58 @@ function selectVenue(v) {
   selectForm.value.price = '--'
   selectForm.value.priceEn = '--'
   remarks.value = v.remarks
+  currTick.value = null
+
   getTicketListType()
 }
 
 function selectSessionType(key) {
+  if (key == selectForm.value.sessionType) {
+    return
+  }
+
   selectForm.value.sessionType = key
 
   // currTick.value = tickList.value[selectForm.value.sessionType][0]
   selectForm.value.latstId = currTick.value?.id
   selectForm.value.price = currTick.value?.price
   selectForm.value.priceEn = currTick.value?.priceEn
+  currTick.value = null
 }
 
 // 选择票型
 function selectTick(v) {
+  if (v.id == selectForm.value.latstId) {
+    return
+  }
+
   currTick.value = v
   selectForm.value.latstId = v.id
   selectForm.value.price = v.price
   selectForm.value.priceEn = v.priceEn
-  // console.log(v)
+
+  // vip票
+  if (currTick.value.ticketType == '1') {
     showUrl.value = v.images
     show.value = true
+    leftCount.value = -999
+  } else {
+    checkNonPayment().then(res => {
+      if (res.data) {
+        getListByAtstId({
+          atstId: selectForm.value.latstId
+        }).then(res => {
+          leftCount.value = res.data
+          if (leftCount.value > 0) {
+            showUrl.value = v.images
+            show.value = true
+          }
+        })
+      } else {
+        leftCount.value = -999
+      }
+    })
+  }
 }
 
 function toSelectSeat() {
@@ -420,6 +462,9 @@ function toSelectSeat() {
     useStore.setVisitor()
     return
   }
+  if (!selectForm.value.latstId) {
+    return proxy.$modal.confirm(language.value == 0 ? '请选择票型' : 'Please select a ticket type')
+  }
   checkNonPayment().then(res => {
     if (res.data) {
       router.push({
@@ -449,7 +494,7 @@ function toSelectClosed() {
 async function getmatchData() {
   const res = await getBaseInfoByActiveId(route.params.activeId)
   matchData.value = res.data
-  console.log(res)
+  // console.log(res)
 }
 
 function handleImage() {
@@ -548,6 +593,7 @@ getmatchData()
       }
 
       .forbid {
+        pointer-events: none;
         opacity: 0.5 !important;
         cursor: not-allowed !important;
       }
@@ -798,4 +844,10 @@ getmatchData()
   line-height: 40px;
   color: #2b2f3a;
 }
+
+.disabled {
+  background: #878787 !important;
+  color: #4a4a4a !important;
+  cursor: no-drop !important;
+}
 </style>

@@ -6,7 +6,7 @@
           <div class="bg-lineg">
             <div class="pl-back" @click="goBack">
               <el-icon>
-                <ArrowLeftBold/>
+                <ArrowLeftBold />
               </el-icon>
               返回
             </div>
@@ -21,52 +21,22 @@
               <label class="blueTag">票务订单</label>
               <h3>{{ matchForm.name }}</h3>
               <div>
-                <p>地址：{{ matchForm.address }}</p>
-                <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
-                <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p>
-                <p>通票：{{ paymentType != 3 ? '¥' : '€' }}
-                  {{
-                    paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
-                  }}
-                  /1张</p>
-                <p>优惠票：{{ paymentType != 3 ? '¥' : '€' }}
-                  {{
-                    paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
-                  }}
-                  /1张</p>
-                <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
+                <p>票档：{{ ticketForm.extJson?.atName }}</p>
+                <p>场馆：{{ ticketForm.extJson?.atsName }}</p>
+                <p>场次：{{ ticketForm.extJson?.sessionType =='1000'? '日间场' : '夜间场' }}</p>
+                <p>票型：{{ ticketForm.extJson?.atstName }}</p>
               </div>
               <div>
-                <el-row v-for="v in message" style="width: 100%">
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    <div>{{ v.name }}
-                    </div>
-                  </el-col>
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    <div>{{ !v.discount ? '通票' : '优惠票' }}
-                    </div>
-                  </el-col>
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    {{
-                      !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
-                    }}
-                    {{ paymentType != 3 ? '￥' : '€' }}/张
-                  </el-col>
-                </el-row>
                 <el-row style="width: 100%">
                   <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    <div>{{
-                        language == 0 ? '购票数量' : 'Number of tickets purchased'
-                      }}：{{ ticketForm.num }}张
+                    <div>购票数量：{{ ticketForm.num }}张
                     </div>
                   </el-col>
-                  <el-col :lg="8" :md="12" :sm="12" :xs="24">{{
-                      language == 0 ? '联系方式' : 'Contact Information'
-                    }}：{{ ticketForm.phone }}
+                  <el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
                   </el-col>
                   <el-col :lg="8" :md="12" :sm="12" :xs="24">
-                    共计:{{ (totalMoney * 1).toFixed(2) }}{{
-                      paymentType != 3 ? '￥' : '€'
+                    共计:{{ (totalMoney*1).toFixed(2) }}{{
+                      paymentType == 1 ? '￥' : '€'
                     }}
                   </el-col>
                 </el-row>
@@ -74,8 +44,10 @@
             </div>
             <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div>
             <div class="border-rr mt20 pd20">
-              <el-form ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
-                       class="mw500">
+              <el-form
+                ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
+                class="mw500"
+              >
                 <el-form-item :label="'开票金额'">
                   <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
                 </el-form-item>
@@ -124,27 +96,27 @@
           <el-button plain round type="primary" @click="backList">返回</el-button>
         </div>
       </el-card>
-      <div style="height: 60px;"></div>
+      <div style="height: 60px;" />
     </div>
   </div>
 </template>
 
 <script setup>
-import {useRouter, useRoute} from "vue-router";
-import {ref, onMounted} from "vue";
-import {useStorage} from "@vueuse/core/index";
+import { useRouter, useRoute } from 'vue-router'
+import { ref, onMounted } from 'vue'
+import { useStorage } from '@vueuse/core/index'
 import dayjs from 'dayjs'
-import {ElMessage, ElMessageBox} from "element-plus";
-import useUserStore from "@/store/modules/user";
-import {getCurrentInstance} from "@vue/runtime-core";
+import { ElMessage, ElMessageBox } from 'element-plus'
+import useUserStore from '@/store/modules/user'
+import { getCurrentInstance } from '@vue/runtime-core'
 import {
   getInvoiceDetail,
   getTicketOrderInfo,
   getTicketInfoByActivityId
-} from "@/apiPc/booking";
-import {getOrderDetail} from "@/viewsPc/seat/api/index";
+} from '@/apiPc/booking'
+import { getOrderDetail } from '@/viewsPc/seat/api/index'
 
-const {proxy} = getCurrentInstance()
+const { proxy } = getCurrentInstance()
 
 const user = useUserStore().user
 const language = useStorage('language', 0)
@@ -164,58 +136,57 @@ const invoiceId = ref()
 
 const rules = ref({
   invoiceType: [
-    {required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change'}
+    { required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change' }
   ],
   invoiceEmail: [
-    {required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur'}
+    { required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur' }
   ],
   invoiceForm: [
-    {required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change'}
+    { required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change' }
   ],
   invoiceTitle: [
-    {required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur'}
+    { required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur' }
   ],
   invoiceTfn: [
-    {required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur'}
+    { required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur' }
   ],
   invoiceAddress: [
-    {required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur'}
+    { required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur' }
   ],
   invoicePhone: [
-    {required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur'}
+    { required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur' }
   ],
   invoiceBank: [
-    {required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur'}
+    { required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur' }
   ],
   invoiceAccount: [
-    {required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur'}
-  ],
+    { required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur' }
+  ]
 })
 onMounted(() => {
   if (route.query.invoiceId) {
     invoiceId.value = route.query.invoiceId
     getList()
   }
-// 获取票务订单信息
+  // 获取票务订单信息
   getTickInfo()
 })
 
 
 // 票务订单详情
 async function getTickInfo() {
-  const res = await getTicketOrderInfo({orderId: route.query.orderId})
+  const res = await getTicketOrderInfo({ orderId: route.query.orderId })
   ticketForm.value = res.data
   try {
     ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
-    ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
-    ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
-    cptId = ticketForm.value.extJson.ticketDate.activityId
-    totalMoney.val = ticketForm.value.extJson.total
-    message.value = JSON.parse(ticketForm.value.extJson.message)
+    // ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
+    // ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
+    cptId = ticketForm.value.activeId
+    totalMoney.value = ticketForm.value.paymentType != 3 ? ticketForm.value.total : ticketForm.value.totalEn
+    // message.value = JSON.parse(ticketForm.value.extJson.message)
     paymentType.value = ticketForm.value.paymentType
-    totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total
-    await getDetail(ticketForm.value.extJson.ticketDate.activityId)
-    console.log(ticketForm.value)
+    await getDetail(cptId)
+    // console.log(ticketForm.value)
   } catch (e) {
     console.log(e)
   } finally {
@@ -224,19 +195,19 @@ async function getTickInfo() {
 }
 
 async function getDetail(activeId) {
-  const res = await getTicketInfoByActivityId({activityId: activeId})
+  const res = await getTicketInfoByActivityId({ activityId: activeId })
   matchForm.value = res.data
   console.log(matchForm.value)
 }
 
 async function getDataInfo() {
-  const res = await getOrderDetail({orderSn: route.query.orderSn})
+  const res = await getOrderDetail({ orderSn: route.query.orderSn })
   formDate.value = res.data
 }
 
 function getList() {
   getInvoiceDetail(invoiceId.value).then(res => {
-    form.value = res.data;
+    form.value = res.data
     totalMoney.value = form.value.total
   })
 }

@@ -137,6 +137,7 @@ import { triggerLanguage } from '@/utils/ruoyi'
 import { useStorage } from '@vueuse/core/index'
 import { useRoute, useRouter } from 'vue-router'
 import { getCurrentInstance } from '@vue/runtime-core'
+import dayjs from 'dayjs'
 
 const language = useStorage('language', 0)
 const useStore = useUserStore()
@@ -170,7 +171,9 @@ onMounted(() => {
 async function getLogexScenicVoById() {
   const res = await booking.getLogexScenicVoById({ id: lasId.value })
   travel.value = res.data
+  const nowDate = dayjs().format('YYYY-MM-DD')
   selectForm.value.lasId = lasId.value
+  travel.value.dateList = travel.value.dateList.filter(val => dayjs(val).format('YYYY-MM-DD') >= nowDate)
   if (travel.value.dateList && travel.value.dateList.length > 0) {
     selectForm.value.scenicDate = travel.value.dateList[0]
     await getGateListByLasId()
@@ -183,6 +186,7 @@ async function getGateListByLasId() {
     scenicDate: selectForm.value.scenicDate
   })
   ticketList.value = res.data
+  console.log(33333, ticketList.value)
   for (const v of ticketList.value) {
     v.leftNum = v.num - v.orderCount
     v.count = 0
@@ -230,6 +234,12 @@ async function toSelectSeat() {
     await proxy.$modal.confirm(language.value == 0 ? '请选择日期' : 'Please select a date')
     return
   }
+  
+  if (ticketList.value.length <= 0) {
+    await proxy.$modal.confirm(language.value == 0 ? `${selectForm.value.scenicDate}的票型已售完，请选择其它日期。` : `The ticket type for ${selectForm.value.scenicDate} is sold out. Please select another date.`)
+    return
+  }
+  
   if (!selectForm.value.price == '--' || selectForm.value.price == '--') {
     await proxy.$modal.confirm(language.value == 0 ? '请选择购票数量' : 'Please select the number of tickets to purchase')
     return

@@ -86,10 +86,10 @@
             <el-col :lg="9" :md="12" :sm="12" :xs="24">
               <h3 class="m0">{{ b.name }}</h3>
               <p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{
-                b.messageObj.ticketDate.name
+                b.messageObj.atName
               }}</p>
               <p class="common">
-                {{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.num }}{{ language == 0 ? "张" : "tickets" }}
+                {{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.orderCustomerList.length }}{{ language == 0 ? "张" : "tickets" }}
               </p>
             </el-col>
             <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
@@ -336,8 +336,6 @@ const getList = () => {
       list.value = res.rows
       for (const b of list.value) {
         b.messageObj = JSON.parse(b.extJson)
-        b.messageObj.ticketDate = JSON.parse(b.messageObj.ticketDate)
-        b.messageObj.ticketType = JSON.parse(b.messageObj.ticketType)
       }
       loading.value = false
       console.log(list.value)

@@ -126,7 +126,7 @@ function popRemark(type) {
     (form.value.isFoodView == 0 && type == '3') ||
     (form.value.isMealView == 0 && type == '4') ||
     (form.value.isPhotoView == 0 && type == '5') ||
-    (form.value.isTicket == 0 && type == '0') ||
+    (form.value.isTicketView == 0 && type == '0') ||
     (form.value.isScenicView == 0 && type == '8')
   ) {
     building()

@@ -5,26 +5,28 @@
     close-icon="CircleClose" destroy-on-close
     width="460px"
   >
-    <div style="min-height: 300px" v-loading="loading">
+    <div v-loading="loading" style="min-height: 300px">
       
       <div v-if="!type||type==''">
-        <div @click="type='0'" class="rItem">{{ language == 0 ? '个人查询' : 'Personal Query' }}</div>
-        <div @click="type='1'" class="rItem">{{ language == 0 ? '团队查询' : 'Team Query' }}</div>
+        <div class="rItem" @click="type='0'">{{ language == 0 ? '个人查询' : 'Personal Query' }}</div>
+        <div class="rItem" @click="type='1'">{{ language == 0 ? '团队查询' : 'Team Query' }}</div>
       </div>
       
       <div v-if="type=='0'">
         <div class="flex mt30">
-          <el-input :placeholder="language==0?'输入会员号 / 姓名查询':'Enter WDSF MIN / Name to Query'" v-model="query"
+          <el-input
+            v-model="query" :placeholder="language==0?'输入会员号 / 姓名查询':'Enter WDSF MIN / Name to Query'"
             clearable
-                    @enter="search" @blur="search" @empty="search"/>
-          <el-button @click="search" class="btn-lineG" style="color: #fff">{{
+            @blur="search" @empty="search" @enter="search"
+          />
+          <el-button class="btn-lineG" style="color: #fff" @click="search">{{
             language == 0 ? '查询' : 'Search'
           }}
           </el-button>
         </div>
         
         <div v-if="list.length>0">
-          <div class="nowteamItem" v-for="(form, index) in list" :key="index">
+          <div v-for="(form, index) in list" :key="index" class="nowteamItem">
             <div class="info">
               <div class="nowName text-center">
                 <span class="text-primary">{{ form.number }}</span>
@@ -48,36 +50,38 @@
           </div>
         </div>
         <div v-else>
-          <el-empty/>
+          <el-empty />
         </div>
       </div>
       <div v-if="type=='1'">
         <div class="flex mt20">
           <el-input
+            v-model="query2"
             :placeholder="language==0?'请输入代表队名称至少两字符':'Enter the representing team name,At least two characters'"
-              v-model="query2" clearable
-              @enter="searchTeam" @blur="searchTeam" @empty="searchTeam"/>
-          <el-button @click="searchTeam" class="btn-lineG" style="color: #fff">
+            clearable
+            @blur="searchTeam" @empty="searchTeam" @enter="searchTeam"
+          />
+          <el-button class="btn-lineG" style="color: #fff" @click="searchTeam">
             {{ language == 0 ? '查询' : 'Search' }}
           </el-button>
         </div>
         <span class="tip">*{{ language == 0 ? '模糊查询' : 'Fuzzy query' }}</span>
-        <div class="text-danger text-center" v-if="showGroupList">
+        <div v-if="showGroupList" class="text-danger text-center">
           {{ language == 0 ? '找到多个团体' : 'Found multiple teams' }}
         </div>
-        <div class="groupList" v-if="showGroupList">
+        <div v-if="showGroupList" class="groupList">
           <ul>
-            <li v-for="(item, index) in groupList" @click="showDetail(item)" :key="index">{{ item }}
+            <li v-for="(item, index) in groupList" :key="index" @click="showDetail(item)">{{ item }}
               <el-icon class="fr">
-                <ArrowRight/>
+                <ArrowRight />
               </el-icon>
             </li>
           </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">
+            <el-collapse-item v-for="(team,index) in teamlist" :key="index" :name="index" :title="team[0][0].groupName">
+              <div v-for="(p,jndex) in team" :key="jndex" class="nowteamItem">
                 <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>
@@ -94,10 +98,10 @@
 </template>
 
 <script setup>
-import {ref} from "vue";
-import {ElMessage} from "element-plus";
-import {getBackNumber, getTeamBackNumber, getTeamBackNumberPre} from "@/apiPc/common";
-import {useStorage} from "@vueuse/core/index";
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getBackNumber, getTeamBackNumber, getTeamBackNumberPre } from '@/apiPc/common'
+import { useStorage } from '@vueuse/core/index'
 
 const language = useStorage('language', 0)
 const show = ref(false)
@@ -109,23 +113,24 @@ const teamlist = ref([])
 const query = ref('')
 const query2 = ref('')
 const type = ref('')
+const cptId = ref('')
 const activeNames = ref(0)
 const showGroupList = ref(false)
+
 const search = () => {
   if (!query.value) {
     ElMessage.warning(language.value == 0 ? '请输入会员号/姓名' : 'Please enter WDSF MIN / Name')
     return
   }
-  getBackNumber({query: query.value}).then(res => {
+  getBackNumber({ query: query.value, cptId: cptId.value }).then(res => {
     if (!res.data || res.data.length == 0) {
       list.value = []
-      //提示 '未找到结果，请重新查询'
+      // 提示 '未找到结果，请重新查询'
       ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
       return
     }
     list.value = res.data
   })
-
 }
 const searchTeam = () => {
   teamlist.value = []
@@ -134,11 +139,11 @@ const searchTeam = () => {
     return
   }
   loading.value = true
-  getTeamBackNumberPre({query: query2.value}).then(res => {
+  getTeamBackNumberPre({ query: query2.value, cptId: cptId.value }).then(res => {
     loading.value = false
     if (!res.data || res.data.length == 0) {
       groupList.value = []
-      //提示 '未找到结果，请重新查询'
+      // 提示 '未找到结果，请重新查询'
       ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
       return
     }
@@ -149,10 +154,12 @@ const searchTeam = () => {
     if (groupList.value.length > 1) {
       showGroupList.value = true
     }
-
   })
 }
+
 const open = (param) => {
+  console.log(param)
+  cptId.value = param.cptId
   show.value = true
   list.value = []
   teamlist.value = []
@@ -168,14 +175,14 @@ function showDetail(name) {
   query2.value = name
   showGroupList.value = false
   loading.value = true
-  getTeamBackNumber({query: name}).then(res => {
+  getTeamBackNumber({ query: name, cptId: cptId.value }).then(res => {
     loading.value = false
     teamlist.value = res.data
   })
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .tip {
   font-size: 12px;
   margin: 4px 0 0;

@@ -153,10 +153,10 @@
               <!--                @click="popMaster"-->
               <!--              >青少年公益课报名</a>-->
               <a
-                v-show="matchData?.id=='1778253367748993026'" class="zn-btn ml20 btn-q"
+                v-show="matchData?.id" class="zn-btn ml20 btn-q"
                 @click="backNumberSearch"
               >背号查询</a>
-              <a v-show="matchData?.id=='1778253367748993026'" class="zn-btn ml20 btn-q" @click="schSearch">日程查询</a>
+              <a v-show="matchData?.id" class="zn-btn ml20 btn-q" @click="schSearch">日程查询</a>
             </div>
           </el-col>
           <el-col :lg="14" :sm="24">
@@ -192,8 +192,13 @@
               <el-table-column label="国家" prop="name">
                 <template #default="scope">
                   <div>
-                    <span :class="`flag-icon flag-icon-${scope.row.code}`" />
-                    {{ language == 0 ? scope.row.name : scope.row.enName }}
+                    <span v-if="scope.row.code!='tw'" :class="`flag-icon flag-icon-${scope.row.code}`" />
+                    <span v-else class="flag-icon">
+                      <img :src="hkImage" alt="" class="hkimg">
+                    </span>
+                    <span>
+                      {{ language == 0 ? scope.row.code != 'tw' ? scope.row.name : '中华台北' : scope.row.enName }}
+                    </span>
                   </div>
                 </template>
               </el-table-column>
@@ -490,6 +495,7 @@ import 'swiper/css'
 import { dayjs } from 'element-plus'
 import * as match from '@/apiPc/match'
 import { getAboutUs, getppInfo, getZNList } from '@/apiPc/match'
+import hkImage from '@/assets/nationalFlag/hk.png'
 
 import AffixInvitation from '/@/viewsPc/match/components/affix-invitation.vue'
 import { useStorage } from '@vueuse/core/index'
@@ -1301,6 +1307,13 @@ function applyInvitation() {
   top: 40%;
 }
 
+.hkimg {
+  width: 19px;
+  height: 14px;
+  position: absolute;
+  top: 0;
+}
+
 .btn2 {
   cursor: pointer;
   padding: 10px 80px;

@@ -184,7 +184,11 @@
               <el-table-column label="COUNTRY" min-width="200">
                 <template #default="scope">
                   <div>
-                    <span :class="`flag-icon flag-icon-${scope.row.code}`" />
+                    <!--                    <span :class="`flag-icon flag-icon-${scope.row.code}`" />-->
+                    <span v-if="scope.row.code!='tw'" :class="`flag-icon flag-icon-${scope.row.code}`" />
+                    <span v-else class="flag-icon">
+                      <img :src="hkImage" alt="" class="hkimg">
+                    </span>
                     {{ language == 0 ? scope.row.name : scope.row.enName }}
                   </div>
                 </template>
@@ -472,6 +476,7 @@ import { useStorage } from '@vueuse/core/index'
 import useUserStore from '/@/store/modules/user'
 import clubImage from '@/assets/logo/club.png'
 import { fillImgUrl } from '/@/utils/ruoyi'
+import hkImage from '/@/assets/nationalFlag/hk.png'
 
 
 const language = useStorage('language', 0)
@@ -1418,6 +1423,13 @@ function applyInvitation() {
   
 }
 
+.hkimg {
+  width: 19px;
+  height: 14px;
+  position: absolute;
+  top: 0;
+}
+
 .club {
   width: 130px;
   right: 0;

@@ -20,7 +20,7 @@
         <el-col :span="10">
           <el-form-item v-if="language!=0" label="WDSF code" prop="wdsfMin">
             <span v-if="form.wdsfMin">{{ form.wdsfMin }}</span>
-            <el-input v-else v-model="form.wdsfMin" type="text" />
+            <el-input v-else v-model.trim="form.wdsfMin" type="text" />
           </el-form-item>
           <el-form-item :label="language==0?'姓名':'Name'" prop="realName" required>
             <el-input v-model="form.realName" :disabled="editgay&&form.labelArr.indexOf('0')>-1" />

@@ -101,9 +101,11 @@
             <el-input v-model="form.certName" :disabled="editgay" />
           </el-form-item>
           <el-form-item
+            v-if="form.idcType!=3 "
             :label="language==0?'证件类型':'ID Type'" :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1"
             prop="idcType"
           >
+            
             <el-select v-model="form.idcType" :disabled="editgay" style="width: 100%;">
               <el-option
                 v-for="item in certificates"
@@ -114,6 +116,7 @@
             </el-select>
           </el-form-item>
           <el-form-item
+            v-if="form.idcType!=3 "
             :label="language==0?'证件号码':'ID NO'" :required="!form.wdsfMin&&form.labelArr.indexOf('0')>-1"
             prop="idcCode"
           >
@@ -286,14 +289,15 @@ const open = (params) => {
       if (form.value.wdsfMin) {
         editDis.value = true
       }
-      if (form.value.idcType == '3') {
-        form.value.idcType = ''
-        form.value.idcCode = ''
-      }
+      // if (form.value.idcType == '3') {
+      //   form.value.idcType = ''
+      //   form.value.idcCode = ''
+      // }
       if (form.value.label) {
         // {0:0,1:1,2:3}
         form.value.labelArr = form.value.label.split(',')
       }
+      console.log(form.value)
     })
   } else {
     editgay.value = false

@@ -20,7 +20,7 @@
             {{ form.wdsfMin }}
           </el-form-item>
           <el-form-item v-else :label="language==0?'WDSF会员号':'WDSF MIN'" required>
-            <el-input v-model="form.wdsfMin" type="text" @change="resetCode">
+            <el-input v-model.trim="form.wdsfMin" type="text" @change="resetCode">
               <template #append>
                 <el-button plain style="width: 110px" type="primary" @click="checkCard">
                   <el-icon v-if="isCodeTrue" color="#67C23A" size="16">

@@ -12,7 +12,7 @@
         {{ form.wdsfMin }}
       </el-form-item>
       <el-form-item v-else :label="language==0?'WDSF卡号':'WDSF MIN'" required>
-        <el-input v-model="card" type="text" @change="resetCode">
+        <el-input v-model.trim="card" type="text" @change="resetCode">
           <template #append>
             <el-button plain style="width: 110px" type="primary" @click="checkCard">
               <el-icon v-if="isCodeTrue" color="#67C23A" size="16">

@@ -157,7 +157,7 @@ const emit = defineEmits(['transfer'])
 const data = reactive({
   query: {
     label: '0',
-    pageSize: 10,
+    pageSize: 9999,
     pageNum: 1
   },
   tableData: [],

+<template>
+  <div style="padding: 30px 20px 20px">
+    <!--成绩-->
+    <div v-html="matchData.scoreUrl" />
+    <el-empty
+      v-if="!matchData.scoreUrl" :image="`/img/order_no.png`" :image-size="228"
+      description=""
+    />
+  
+  </div>
+</template>
+
+<script setup>
+
+const props = defineProps({
+  matchData: {
+    type: Object,
+    required: true
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.time-address {
+  color: #666;
+}
+
+.indexTitle {
+  margin: 20px 0 12px;
+  
+  h3 {
+    font-size: 20px;
+    color: var(--el-color-primary);
+  }
+}
+
+p img {
+  max-width: 100%;
+}
+
+.table {
+  width: 100%;
+  border-left: 1px solid #e1e1e1;
+  border-top: 1px solid #e1e1e1;
+  
+  th {
+    background: #eee;
+    padding: 6px 10px;
+    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 style="filter: opacity(1)">
-    <el-row v-if="language==0" class="btnbox" justify='space-between' :gutter="15">
+    <el-row v-if="language==0" class="btnbox" justify="space-between" :gutter="15">
       <el-col :lg="3" :md="6" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(0)">
-          <img src="@/assets/dance/btn04.png"/>
+          <img src="@/assets/dance/btn04.png">
           <h4>票务预订</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(1)">
-          <img src="@/assets/dance/btn01.png"/>
+          <img src="@/assets/dance/btn01.png">
           <h4>酒店预订</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="11">
         <div class="funcBtn" @click="popRemark(8)">
-          <img src="@/assets/dance/btn08.png"/>
+          <img src="@/assets/dance/btn08.png">
           <h4>旅游服务</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="11">
         <div class="funcBtn" @click="popRemark(2)">
-          <img src="@/assets/dance/btn02.png"/>
+          <img src="@/assets/dance/btn02.png">
           <h4>车辆预订</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="11">
         <div class="funcBtn" @click="popRemark(6)">
-          <img src="@/assets/dance/btn07.png"/>
+          <img src="@/assets/dance/btn07.png">
           <h4>预订查询</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="11">
         <div class="funcBtn" @click="popRemark(3)">
-          <img src="@/assets/dance/btn03.png"/>
+          <img src="@/assets/dance/btn03.png">
           <h4>餐饮预订</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="11">
         <div class="funcBtn" @click="popRemark(4)">
-          <img src="@/assets/dance/btn05.png"/>
+          <img src="@/assets/dance/btn05.png">
           <h4>化妆预约</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="6" :sm="12" :xs="11">
         <div class="funcBtn" @click="popRemark(5)">
-          <img src="@/assets/dance/btn06.png"/>
+          <img src="@/assets/dance/btn06.png">
           <h4>拍照预约</h4>
         </div>
       </el-col>
     </el-row>
 
 
-    <el-row v-else class="btnbox enBtnbox" justify='space-between' :gutter="15">
+    <el-row v-else class="btnbox enBtnbox" justify="space-between" :gutter="15">
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(0)">
-          <img src="@/assets/dance/btn04.png"/>
+          <img src="@/assets/dance/btn04.png">
           <h4>TICKET BOOKING</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(1)">
-          <img src="@/assets/dance/btn01.png"/>
+          <img src="@/assets/dance/btn01.png">
           <h4>HOTEL RESERVATION</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(8)">
-          <img src="@/assets/dance/btn08.png"/>
+          <img src="@/assets/dance/btn08.png">
           <h4>TRAVEL SERVICE</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(2)">
-          <img src="@/assets/dance/btn02.png"/>
+          <img src="@/assets/dance/btn02.png">
           <h4>TRANSPORTATION RESERVATION</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(6)">
-          <img src="@/assets/dance/btn07.png"/>
+          <img src="@/assets/dance/btn07.png">
           <h4>RESERVATION SEARCH</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(3)">
-          <img src="@/assets/dance/btn03.png"/>
+          <img src="@/assets/dance/btn03.png">
           <h4>DINING RESERVATION</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(4)">
-          <img src="@/assets/dance/btn05.png"/>
+          <img src="@/assets/dance/btn05.png">
           <h4>MAKEUP APPOINTMENT</h4>
         </div>
       </el-col>
       <el-col :lg="3" :md="8" :sm="12" :xs="12">
         <div class="funcBtn" @click="popRemark(5)">
-          <img src="@/assets/dance/btn06.png"/>
+          <img src="@/assets/dance/btn06.png">
           <h4>PHOTOGRAPHY APPOINTMENT</h4>
         </div>
       </el-col>
     </el-row>
   </div>
-  <order-remark ref="orderRemarkRef" @submit="goBooking"/>
+  <order-remark ref="orderRemarkRef" @submit="goBooking" />
 
   <!--  <div class="fixedKP" @click="addInvoice">-->
   <!--    <img src="@/assets/img/kp.svg"/>-->
@@ -112,15 +112,15 @@
 </template>
 
 <script setup>
-import {ElMessage} from "element-plus";
-import {useRouter} from "vue-router";
-import {useStorage} from "@vueuse/core/index";
+import { ElMessage } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { useStorage } from '@vueuse/core/index'
 import OrderRemark from '@/viewsPc/components/orderRemark'
-import {getBaseInfoByActiveId} from "@/apiPc/booking";
-import {getCurrentInstance} from "@vue/runtime-core";
-import {onMounted} from "vue";
+import { getBaseInfoByActiveId } from '@/apiPc/booking'
+import { getCurrentInstance } from '@vue/runtime-core'
+import { onMounted } from 'vue'
 
-const {proxy} = getCurrentInstance()
+const { proxy } = getCurrentInstance()
 
 const router = useRouter()
 const language = useStorage('language', 0)
@@ -148,7 +148,6 @@ onMounted(() => {
 
 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.')
-
 }
 
 function popRemark(type) {
@@ -156,7 +155,7 @@ function popRemark(type) {
     return router.push({
       path: '/match/list/reservationSearch',
       query: {
-        matchId: props.matchId,
+        matchId: props.matchId
       }
     })
   }
@@ -165,13 +164,13 @@ function popRemark(type) {
     return
   }
 
-  if ((form.value.isJdView == 0 && type == '1')
-    || (form.value.isCarView == 0 && type == '2')
-    || (form.value.isFoodView == 0 && type == '3')
-    || (form.value.isMealView == 0 && type == '4')
-    || (form.value.isPhotoView == 0 && type == '5')
-    || (form.value.isTicket == 0 && type == '0')
-    || (form.value.isScenicView == 0 && type == '8')
+  if ((form.value.isJdView == 0 && type == '1') ||
+    (form.value.isCarView == 0 && type == '2') ||
+    (form.value.isFoodView == 0 && type == '3') ||
+    (form.value.isMealView == 0 && type == '4') ||
+    (form.value.isPhotoView == 0 && type == '5') ||
+    (form.value.isTicketView == 0 && type == '0') ||
+    (form.value.isScenicView == 0 && type == '8')
   ) {
     building()
     return
@@ -184,7 +183,6 @@ function popRemark(type) {
     cptName: props.cptName
   }
   proxy.$refs['orderRemarkRef'].open(params)
-
 }
 
 function goBooking(n) {
@@ -192,33 +190,33 @@ function goBooking(n) {
     case 0:
       // 票务
       router.push({
-        path: `/booking/ticket/${props.matchId}`,
+        path: `/booking/ticket/${props.matchId}`
       })
-      break;
+      break
     case 1:
-      //酒店
-      router.push({path: `/booking/hotel/${props.matchId}`})
-      break;
+      // 酒店
+      router.push({ path: `/booking/hotel/${props.matchId}` })
+      break
     case 2:
-      //车辆
-      router.push({path: `/booking/car/${props.matchId}`})
-      break;
+      // 车辆
+      router.push({ path: `/booking/car/${props.matchId}` })
+      break
     case 3:
-      //餐饮
-      router.push({path: `/booking/dinner/${props.matchId}`})
-      break;
+      // 餐饮
+      router.push({ path: `/booking/dinner/${props.matchId}` })
+      break
     case 4:
-      //化妆
-      router.push({path: `/booking/makeup/${props.matchId}`})
-      break;
+      // 化妆
+      router.push({ path: `/booking/makeup/${props.matchId}` })
+      break
     case 5:
-      //拍照
-      router.push({path: `/booking/photography/${props.matchId}`})
-      break;
+      // 拍照
+      router.push({ path: `/booking/photography/${props.matchId}` })
+      break
     case 8:
-      //旅游
-      router.push({path: `/booking/travel/${props.matchId}`})
-      break;
+      // 旅游
+      router.push({ path: `/booking/travel/${props.matchId}` })
+      break
   }
 }
 

@@ -380,8 +380,10 @@
             
             </div>
             <div v-if="menu[4].active==1">
-              <!--成绩-->
-              <el-empty :image="`/img/order_no.png`" :image-size="228" description="" />
+              <!--              &lt;!&ndash;成绩&ndash;&gt;-->
+              <!--              <el-empty :image="`/img/order_no.png`" :image-size="228" description="" />-->
+              
+              <matchPerformance :match-data="matchData" />
             </div>
             <div v-if="menu[5].active==1" class="pd20">
               <div class="xzbox">
@@ -422,6 +424,7 @@
             <substation-list v-if="menu1[0].active==1" :list="matchData.cpts" />
             <matchInfo v-if="menu1[1].active==1" :form="matchData" />
             <match-schedule-list v-if="menu1[2].active==1" :match-data="matchData" />
+            <matchPerformance v-if="menu1[3].active==1" :match-data="matchData" />
           </el-card>
         </el-col>
       </el-row>
@@ -482,6 +485,9 @@ import SubstationList from '@/viewsPc/match/components/substation-list'
 import MatchInfoProjectList from '@/viewsPc/match/components/matchInfo-projectList'
 import QuickRow from '@/viewsPc/match/components/quick-row'
 import Pickup from '@/viewsPc/components/pickup'
+import matchPerformance from '@/viewsPc/match/components/matchPerformance.vue'
+
+
 import { getCurrentInstance, ref, watch } from 'vue'
 import { reactive, onMounted } from '@vue/runtime-core'
 import { useRoute, useRouter } from 'vue-router'
@@ -518,11 +524,15 @@ const data = reactive({
     { name: 'Schedule', cn: '日程', active: 0 },
     { name: 'Participating teams', cn: '参赛人员', active: 0 },
     { name: 'Achievement', cn: '成绩', active: 0 },
-    { name: 'Notes', cn: '报名须知', active: 0 }],
+    { name: 'Notes', cn: '报名须知', active: 0 }
+  ],
   menu1: [
     { name: 'Tournaments', cn: '分站赛', active: 1 },
     { name: 'Event details', cn: '赛事详情', active: 0 },
-    { name: 'Schedule', cn: '日程', active: 0 }],
+    { name: 'Schedule', cn: '日程', active: 0 },
+    { name: 'Achievement', cn: '成绩', active: 0 }
+  ],
+  
   signDoneGroupList: [],
   signDoneGroupListToTal: 0,
   queryGroupList: {
@@ -577,7 +587,7 @@ function getMatch(id) {
   loading.value = true
   match.getMatchById({ id: id }).then(res => {
     matchData.value = res.data
-    console.log(matchData.value)
+    console.log(666666, matchData.value)
     loading.value = false
     const today = dayjs().format('YYYY-MM-DD HH:mm:ss')
     time.value = dayjs(res.data.signEndTime).diff(today, 'millisecond')
@@ -603,12 +613,12 @@ function getGroupListByCptId() {
 
 function changeMenu(menu, l) {
   console.log(matchData.value.leagueId, l.name)
-  if (
-    matchData.value.leagueId == '1778253367748993026' &&
-    (l.name == '成绩' || l.name == 'Achievement')
-  ) {
-    window.open('http://www.cdsf.org.cn/h5/sscj.index?matchID=526')
-  }
+  // if (
+  //   matchData.value.leagueId == '1778253367748993026' &&
+  //   (l.name == '成绩' || l.name == 'Achievement')
+  // ) {
+  //   window.open('http://www.cdsf.org.cn/h5/sscj.index?matchID=526')
+  // }
   for (const n of menu) {
     if (n == l) {
       n.active = 1

@@ -12,7 +12,7 @@
                 size="large" style="max-width: 560px;margin: auto"
               >
                 <el-form-item :label="language==0?'WDSF会员号':'WDSF MIN'" required>
-                  <el-input v-model="form.card" type="text" @blur="verifyCode" @change="resetCode(0)">
+                  <el-input v-model.trim="form.card" type="text" @blur="verifyCode" @change="resetCode(0)">
                     <template #append>
                       <el-button plain style="width: 110px" type="primary" @click="checkCard">
                         <el-icon v-if="wdsfData.wdsfFlag=='1'" color="#67C23A" size="16">

@@ -63,8 +63,13 @@
           <el-table-column :label="language==0?'国家':'Country'" min-width="200" prop="name">
             <template #default="scope">
               <div>
-                <span :class="`flag-icon flag-icon-${scope.row.code}`" />
-                {{ language == 0 ? scope.row.name : scope.row.enName }}
+                <span v-if="scope.row.code!='tw'" :class="`flag-icon flag-icon-${scope.row.code}`" />
+                <span v-else class="flag-icon">
+                  <img :src="hkImage" alt="" class="hkimg">
+                </span>
+                <span>
+                  {{ language == 0 ? scope.row.code != 'tw' ? scope.row.name : '中华台北' : scope.row.enName }}
+                </span>
               </div>
             </template>
           </el-table-column>
@@ -160,6 +165,7 @@ import { cjList } from '@/assets/js/data'
 import { ArrowRight } from '@element-plus/icons-vue'
 import { dayjs } from 'element-plus'
 import * as match from '@/apiPc/match'
+import hkImage from '@/assets/nationalFlag/hk.png'
 
 const router = useRouter()
 import { useStorage } from '@vueuse/core/index'
@@ -441,4 +447,11 @@ h3 {
   background-clip: text; /* 标准语法 */
   -webkit-text-fill-color: transparent; /* 文字颜色透明 */
 }
+
+.hkimg {
+  width: 19px;
+  height: 14px;
+  position: absolute;
+  top: 0;
+}
 </style>

@@ -4,7 +4,10 @@
       <div class="mt20" />
       <el-card class="mt20 mb20">
         
-        <h3 style="text-align: center">{{ language == 0 ? query.name : query.enName }}</h3>
+        <h3 style="text-align: center">
+          <!--          {{ // language == 0 ? query.name : query.enName  }}-->
+          {{ language == 0 ? query.code != 'tw' ? query.name : '中华台北' : query.enName }}
+        </h3>
         <div class="mt20" />
         <el-table :data="rank" stripe>
           <el-table-column :label="language==0?'组别':'Group'" align="center" min-width="200">
@@ -20,8 +23,13 @@
           <el-table-column :label="language==0?'国家':'Country'" prop="name">
             <template #default="scope">
               <div>
-                <span :class="`flag-icon flag-icon-${query.code}`" />
-                {{ language == 0 ? scope.row.countryName : scope.row.countryNameEn }}
+                <!--                <span :class="`flag-icon flag-icon-${query.code}`" />-->
+                <span v-if="query.code!='tw'" :class="`flag-icon flag-icon-${query.code}`" />
+                <span v-else class="flag-icon">
+                  <img :src="hkImage" alt="" class="hkimg">
+                </span>
+                {{ language == 0 ? query.code != 'tw' ? scope.row.name : '中华台北' : scope.row.enName }}
+                <!--                {{ language == 0 ? scope.row.countryName : scope.row.countryNameEn }}-->
               </div>
             </template>
           </el-table-column>
@@ -49,6 +57,7 @@
 import { onMounted, ref } from 'vue'
 import * as match from '@/apiPc/match'
 import { useRoute } from 'vue-router'
+import hkImage from '@/assets/nationalFlag/hk.png'
 
 const route = useRoute()
 import { useStorage } from '@vueuse/core/index'
@@ -227,4 +236,11 @@ h3 {
 .w15 {
   width: 15%;
 }
+
+.hkimg {
+  width: 19px;
+  height: 14px;
+  position: absolute;
+  top: 0;
+}
 </style>

@@ -64,8 +64,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api/ztx-train': {
-          // target: 'http://192.168.1.118:1896/stage-api',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          target: 'http://192.168.1.118:1896/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
         },
@@ -83,11 +83,10 @@ 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.129:8081',
-          // target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'http://192.168.1.213:8081/',
+          // target: 'http://192.168.1.118:8081',
+          target: 'https://jijin.wtwuxicenter.com/stage-api',
           // target: 'https://wdsfwuxicenter.com/stage-api/',
-          target: 'http://7s18uou5jv74.ngrok.xiaomiqiu123.top/',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },