Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
6f2459bd by zhangmeng
Options

Merge branch 'devmatch' into 中分支 

# Conflicts:
#	src/viewsPc/index.vue
#	src/viewsPc/index_en.vue
#	src/viewsPc/match/detail_en.vue
#	vite.config.js
2 parents ffb4a923 6c5ea483
Inline Side-by-side
Showing 28 changed files with 817 additions and 574 deletions
src/apiPc/common.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
})
......
src/viewsPc/booking/pay.vue
......@@ -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>
......
src/viewsPc/booking/ticket/addInvoice.vue
......@@ -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,14 +34,14 @@
<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>
</div>
</div>
<div class="leftboderTT">
{{ paymentType != 3 ? '开票信息' : 'Invoice information' }}
</div>
......@@ -82,15 +51,15 @@
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>
<el-radio-group v-model="form.invoiceForm">
<el-radio value="1">{{ language == 0 ? '电子发票' : 'E-invoice' }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="language==0 ?`发票类型`:'Invoice Type'" prop="invoiceType" required>
<el-radio-group v-model="form.invoiceType">
<el-radio value="0">{{ language == 0 ? '企业' : 'Company' }}</el-radio>
......@@ -132,7 +101,7 @@
</el-form-item>
</div>
</el-form>
<div v-if="remark" class="tip">
<label>{{ paymentType != 3 ? '开票须知' : 'Invoice Notice' }}:</label>
<div v-html="remark" />
......@@ -140,7 +109,7 @@
</div>
</el-col>
</el-row>
<el-row align="middle" class="pd20" justify="center">
<el-col :span="12" class="text-center">
<el-button class="btn-lineG w200px" round size="large" type="primary" @click="submit">
......@@ -150,7 +119,7 @@
</el-row>
</el-card>
<div style="height: 60px;" />
</div>
</div>
<address-list-dialog ref="dialogAddressListRef" @submit="getAddress" />
......@@ -248,27 +217,27 @@ 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 {
}
}
async function getDetail(activeId) {
const res = await getTicketInfoByActivityId({ activityId: activeId })
matchForm.value = res.data
console.log(matchForm.value)
// console.log(matchForm.value)
}
function getList() {
......@@ -370,7 +339,7 @@ function goBack() {
.border-info {
position: relative;
& > label {
position: absolute;
right: 0;
......@@ -380,7 +349,7 @@ function goBack() {
padding: 5px 15px;
font-size: 14px;
}
.poPrice {
position: absolute;
bottom: 0px;
......@@ -435,12 +404,12 @@ function goBack() {
.ccitemBox {
overflow: auto;
label {
margin: 10px 0;
display: block;
min-height: 30px;
span {
color: #FF8124;
font-family: DIN Alternate;
......@@ -455,12 +424,12 @@ function goBack() {
font-size: 15px;
color: #666;
margin: 5px 0 10px;
label {
font-size: 16px;
color: #000;
}
span {
font-size: 13px;
}
......
src/viewsPc/booking/ticket/confirmOrder.vue
......@@ -12,8 +12,8 @@
<div class="name">{{ TickForm.name }}</div>
<div class="address">{{ TickForm.address }}</div>
</div>
<div class="ticket_info mb20">
<div class="tit_box">
<div class="line" />
......@@ -21,12 +21,12 @@
{{ languageFormat(language, "订票信息", "Ticket Info") }}
</div>
</div>
<div class="form">
<el-form ref="formRef" :model="orderForm" :rules="rules" label-width="140px">
<div v-if="TickForm2.ticketType == '1'">
<el-form-item :label="language == 0 ? '桌号' : 'Table'">
<!-- <el-popover :width="400" placement="right" trigger="hover">-->
<!-- <template #reference>-->
<!-- <div class="text-primary underline pointer" @click="showImg">-->
......@@ -39,7 +39,7 @@
<!-- />-->
<!-- </el-popover>-->
<!-- -->
<el-radio-group v-model="currDesk">
<el-radio-button
v-for="(it, index) in deskList" :key="index" :disabled="it.status!=0" :label="it.deskNo"
......@@ -105,7 +105,7 @@
</div>
</div>
</el-col>
<el-col :lg="8" class="right">
<div class="tit_box">
<div class="line" />
......@@ -113,7 +113,7 @@
{{ languageFormat(language, "订单明细", "Order summary") }}
</div>
</div>
<div class="detail">
<div class="detail_top">
<div class="time">
......@@ -148,14 +148,14 @@
<span v-else>{{ language == 0 ? '夜间场' : 'Night' }}</span>
｜ {{ TickForm2.ticketName }}
</div>
<div v-if="TickForm2.ticketType=='0'" class="address">{{
language == 0 ? '剩余数量' : 'Remaining Quantity'
}}： {{ leftCount }}
</div>
</div>
</div>
<!-- 场馆布局图-->
<div style="margin-top: 30px">
<el-image
......@@ -256,7 +256,7 @@ onMounted(() => {
tickImg.value = route.query.tickImg
customerList()
getDetail()
getActivityTypeVoById({
id: route.params.latstId
}).then((res) => {
......@@ -292,12 +292,12 @@ function changeGroup(e) {
}).then(res => {
if (res.data.length > 0) {
const names = _.map(res.data, (d) => d.name).join(',')
ElMessage({
message: language.value == 0 ? `${names} 已购买该票` : 'The user has purchased the ticket',
type: 'error'
})
_.each(res.data, (d) => {
_.remove(orderForm.value.customerIds, (c) => c == d.id)
_.find(personnelList.value, (p) => p.id == d.id).disabled = true
......@@ -316,10 +316,10 @@ async function customerList() {
// 提交
async function paymentHandle() {
if (!user.value) {
useStore().setVisitor()
useStore.setVisitor()
return
}
if (TickForm2.value.ticketType == '1') {
if (currSeat.value.length == 0) {
ElMessage({
......@@ -336,9 +336,9 @@ async function paymentHandle() {
return
}
}
await formRef.value.validate()
await ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', {
confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
......@@ -359,7 +359,7 @@ async function paymentHandle() {
seatNo: tempSeat.seatNo
})
})
const res = await submitOrderTicket({
activeId: orderForm.value.activeId,
orderName: TickForm2.value.ticketTypeName,
......@@ -406,7 +406,7 @@ async function paymentHandle() {
} catch (e) {
ElMessage.error(language.value == 0 ? '下单失败,' : 'Order failure')
} finally {
}
})
}
......@@ -450,7 +450,7 @@ div {
//padding: 20px 0;
width: 1200px;
margin: 20px auto;
.tag_t {
padding: 1px 10px;
font-weight: 400;
......@@ -460,7 +460,7 @@ div {
border: 1px solid #453dea;
margin-left: 5px;
}
.title {
padding: 11px;
text-align: center;
......@@ -468,18 +468,18 @@ div {
font-size: 18px;
color: #ffffff;
}
.content {
background-color: #fff;
}
.line {
width: 4px;
height: 18px;
background: linear-gradient(180deg, #493ceb 0%, #8623fc 100%);
border-radius: 4px;
}
.left {
.info {
background: rgba(69, 61, 234, 0.04);
......@@ -487,54 +487,54 @@ div {
border: 1px solid #d3d1f6;
padding: 20px 0 28px 33px;
margin-bottom: 20px;
.name {
font-weight: 500;
font-size: 18px;
color: #000000;
margin-bottom: 20px;
}
.address {
font-weight: 400;
font-size: 14px;
color: #929aa0;
}
}
.ticket_info {
.tit_box {
display: flex;
align-items: center;
gap: 10px;
margin-bottom: 14px;
.txt {
font-weight: bold;
font-size: 16px;
color: #493ceb;
}
}
.form {
min-height: 464px;
padding: 20px 60px;
border-radius: 5px;
border: 1px solid #dcdfe6;
.p_box {
display: flex;
width: 100%;
gap: 10px;
max-width: 400px;
.people {
width: 100%;
background: #fbfcfd;
border-radius: 2px;
border: 1px solid #dcdfe6;
padding: 0 14px;
.prople_item {
display: flex;
justify-content: space-between;
......@@ -543,30 +543,30 @@ div {
border-bottom: 1px solid #dcdfe6;
width: 100%;
position: relative;
&:last-child {
border: none;
}
.name {
font-size: 16px;
//color: #929aa0;
margin-bottom: 20px;
.tag_t {
position: absolute;
right: 30px;
padding: 8px;
}
}
.idcard {
font-size: 10px;
color: #929aa0;
}
}
}
.btn {
width: 90px;
height: 40px;
......@@ -585,30 +585,30 @@ div {
}
}
}
.right {
.tit_box {
display: flex;
align-items: center;
gap: 10px;
margin-bottom: 20px;
.txt {
font-weight: bold;
font-size: 16px;
color: #493ceb;
}
}
.detail {
padding: 15px 26px;
border-radius: 5px;
border: 1px solid #dcdfe6;
.detail_top {
padding-bottom: 13px;
border-bottom: 1px solid #dcdfe6;
.time {
font-weight: 500;
font-size: 20px;
......@@ -616,13 +616,13 @@ div {
line-height: 25px;
margin-bottom: 8px;
}
.ticket {
font-size: 16px;
color: #2d373f;
}
}
.detail_center {
margin-top: 14px;
display: flex;
......@@ -630,26 +630,26 @@ div {
padding-bottom: 13px;
border-bottom: 1px solid #dcdfe6;
gap: 8px;
.ticket {
font-size: 16px;
color: #2d373f;
}
}
.detail_b {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 16px;
.sum_txt {
font-weight: 600;
font-size: 18px;
color: #2d373f;
line-height: 25px;
}
.price_num {
font-weight: 600;
font-size: 36px;
......@@ -659,7 +659,7 @@ div {
}
}
}
.footer {
display: flex;
justify-content: space-between;
......@@ -669,20 +669,20 @@ div {
box-shadow: 0px 0px 46px 0px rgba(1, 16, 64, 0.08);
margin-top: 9px;
padding: 0 30px;
.label {
font-size: 16px;
color: #7b7f83;
line-height: 22px;
}
.value {
font-size: 22px;
color: #ff8124;
line-height: 30px;
font-weight: 600;
}
.pay {
width: 200px;
height: 40px;
......@@ -696,7 +696,7 @@ div {
cursor: pointer;
user-select: none;
}
.goBack {
width: 200px;
height: 40px;
......
src/viewsPc/booking/ticket/index.vue
......@@ -37,11 +37,11 @@
<div class="address">
{{ triggerLanguage(language, "地址", "Location") }}：{{ matchForm.address }}
</div>
<div v-if="timeData>0">
<!-- 倒计时-->
<p class="countDownTitle">
<span v-if="language==0">售票倒计时</span>
<span v-else>TICKET COUNTDOWN</span>
......@@ -60,7 +60,7 @@
</van-count-down>
</div>
<div v-else>
<!-- 票档 -->
<div class="select_item_box">
<div class="label">
......@@ -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)"
>
......@@ -83,7 +85,7 @@
</div>
</div>
</div>
<!-- 场馆 -->
<div class="select_item_box">
<div class="label">
......@@ -117,7 +119,7 @@
<div v-if="remarks" class="remarks">{{ remarks }}</div>
</div>
</div>
<!-- 场次 -->
<div class="select_item_box">
<div class="label">
......@@ -145,23 +147,12 @@
</div>
</div>
</div>
<!-- 票型 -->
<div class="select_item_box">
<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">
......@@ -187,10 +178,10 @@
/>
</div>
</div>
</div>
<!-- 价格 -->
<div class="select_item_box">
<div class="label">
......@@ -217,26 +208,31 @@
{{ matchForm.ticketRemark }}
</div>
</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>
<div v-else class="btn" style="margin-left: 40px;margin-top: 10px" @click="toSelectSeat()">
{{
triggerLanguage(language, "立即购票", "Buy tickets now")
}}
</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>
<div class="container bottom">
<div style="display: flex">
<div :class="{'bg':active==1}" class="buBg" @click="active=1">{{ language == 0 ? '购票说明' : 'Notice' }}</div>
......@@ -247,7 +243,7 @@
</div>
<div v-show="active==1" class="rich_content" v-html="matchForm.ticketDes" />
<div v-show="active==2" class="rich_content" v-html="matchForm.ticketNotice" />
<el-dialog v-model="show" align-center title="" width="1000px">
<div style="padding: 20px">
<img :src="fillImgUrl(showUrl)" alt="" style="width: 100%">
......@@ -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)
showUrl.value = v.images
show.value = true
// 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() {
......@@ -494,18 +539,18 @@ getmatchData()
display: flex;
padding: 19px;
margin-top: 26px;
.cover_img {
width: 500px;
height: 667px;
object-fit: fill;
margin-right: 36px;
}
.info {
padding-top: 12px;
width: 100%;
.title {
font-weight: bold;
font-size: 28px;
......@@ -513,7 +558,7 @@ getmatchData()
line-height: 1.6;
margin-bottom: 15px;
}
.time {
font-weight: 600;
font-size: 16px;
......@@ -521,7 +566,7 @@ getmatchData()
line-height: 24px;
margin-bottom: 16px;
}
.address {
font-weight: 600;
font-size: 16px;
......@@ -529,15 +574,15 @@ getmatchData()
line-height: 24px;
margin-bottom: 15px;
}
.select_item_box {
display: flex;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
.label {
font-weight: 600;
font-size: 16px;
......@@ -546,18 +591,19 @@ getmatchData()
margin-right: 12px;
flex-shrink: 0;
}
.forbid {
pointer-events: none;
opacity: 0.5 !important;
cursor: not-allowed !important;
}
.select_item {
display: flex;
flex-wrap: wrap;
gap: 10px;
user-select: none;
.tag_t {
padding: 1px 15px;
font-weight: 400;
......@@ -567,7 +613,7 @@ getmatchData()
border: 1px solid #453dea;
margin-left: 5px;
}
.tag {
display: flex;
padding: 12px 18px;
......@@ -578,7 +624,7 @@ getmatchData()
color: #4a4a4a;
cursor: pointer;
}
.tagActive {
display: flex;
padding: 12px 18px;
......@@ -589,14 +635,14 @@ getmatchData()
color: #493ceb;
cursor: pointer;
}
.tao {
border: 1px solid #493ceb;
font-size: 14px;
color: #493ceb;
margin-left: 10px;
}
.tagDisabled {
padding: 12px 18px;
background: #878787;
......@@ -608,7 +654,7 @@ getmatchData()
}
}
}
.btn {
width: 175px;
height: 40px;
......@@ -628,7 +674,7 @@ getmatchData()
padding: 50px;
margin-top: 30px;
margin-bottom: 30px;
.title {
padding: 20px 30px;
background: linear-gradient(270deg, #493ceb 0%, #8623fc 100%);
......@@ -638,15 +684,15 @@ getmatchData()
line-height: 30px;
margin-bottom: 30px;
}
.rich_content {
margin-top: 30px;
:deep(img) {
width: 100% !important;
height: auto !important;
}
}
}
......@@ -664,44 +710,44 @@ getmatchData()
height: 160px;
margin-right: 15px;
}
.info {
padding: 0;
.title {
font-size: 14px;
margin: 0;
}
.time, .address, .label, .tip {
font-size: 12px;
}
.title, .time, .address, .tip, .select_item_box {
margin-bottom: 3px;
}
.select_item_box {
.label {
font-size: 12px;
}
.select_item .tag {
padding: 2px 10px;
font-size: 12px;
}
.select_item .tagActive {
padding: 2px 10px;
font-size: 12px;
}
.select_item .tagDisabled {
padding: 2px 10px;
font-size: 12px;
}
}
.btn {
display: inline-block;
margin: 10px 0 0;
......@@ -719,8 +765,8 @@ getmatchData()
.bottom {
padding: 0
}
}
.countDownTitle {
......@@ -798,4 +844,10 @@ getmatchData()
line-height: 40px;
color: #2b2f3a;
}
.disabled {
background: #878787 !important;
color: #4a4a4a !important;
cursor: no-drop !important;
}
</style>
......
src/viewsPc/booking/ticket/invoiceDetail.vue
......@@ -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
})
}
......
src/viewsPc/booking/travelDetail.vue
......@@ -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
......
src/viewsPc/booking/travelOrder.vue
......@@ -14,7 +14,7 @@
<el-row :gutter="20" align="middle" class="hote ">
<el-col :span="language == 0?16:24">
<h3 class="esp flex">{{ scenicItem?.name }}
<!-- <el-tag class="ml20" effect="dark">{{ scenicItem?.rank || 0 }}A</el-tag>-->
</h3>
<div class="info">
......@@ -33,7 +33,7 @@
<!-- ～ {{scenicItem?.workTime }}-->
</span>
</div>
<div class="info esp">
<el-icon>
<MapLocation />
......@@ -45,7 +45,7 @@
</el-col>
</el-row>
</div>
<div class="leftboderTT">{{ language == 0 ? '预约信息' : 'Reservation information' }}</div>
<div class="border-rr mt20 pd20">
<el-form
......@@ -120,21 +120,21 @@
</el-icon>
</div>
</div>
<el-form-item :label="language==0?'联系人':'Contact'" prop="contacts">
<el-input v-model="form.contacts" />
</el-form-item>
<el-form-item :label="language==0?'联系电话':'Contact phone'" prop="phone" required>
<el-input v-model="form.phone" />
</el-form-item>
</el-form>
</div>
</el-col>
<el-col :span="10">
<div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div>
<div class="border-rr mt20 pd20 ccitemBox">
<div v-for="(c, index) in gateList" v-show="c.count>0" :key="index" class="ccitem">
{{ c.name }}
<span v-if="language==0">
......@@ -143,18 +143,18 @@
<span v-else>{{ c.count }} * {{ '€' }} {{ c.priceEn }}
</span>
</div>
<label>{{ language == 0 ? '共计' : 'Total' }}
<span class="fr bigMoney">
{{ language == 0 ? '¥' : '€' }} {{ money }}
</span>
</label>
</div>
</el-col>
</el-row>
</el-card>
<el-card class="mt30">
<el-row align="middle" justify="space-between">
<el-col :span="12">
......@@ -176,7 +176,7 @@
</el-card>
<div style="height: 60px;" />
</div>
<choose-person ref="choosePersonRef" @add-person="addPerson" />
</div>
</template>
......@@ -319,7 +319,7 @@ function getCountInfo() {
function changeNum(e) {
checkPersonNum()
if (e.personArr.length < e.count) {
e.personArr.push({
customerId: '',
......@@ -330,7 +330,7 @@ function changeNum(e) {
} else if (e.personArr.length > e.count) {
e.personArr.splice(e.count)
}
countMoney()
}
......@@ -343,8 +343,8 @@ const showAddPerson = (item, index, person) => {
}
})
})
choosePersonRef.value.open({
gateId: item.id,
gateType: item.gateType,
......@@ -361,13 +361,13 @@ const addPerson = (item) => {
idcType: item.idcType,
idCard: item.idCard
}
checkPersonNum()
}
const delPerson = (item, index) => {
item.personArr.splice(index, 1)
item.count--
checkPersonNum()
countMoney()
}
......@@ -399,7 +399,7 @@ function submit() {
ElMessage.warning(language.value == 0 ? '出行人数与票数不匹配' : 'The number of people travelling does not match the number of rooms')
return
}
// 提交确认
ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', {
confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
......@@ -410,7 +410,7 @@ function submit() {
form.value.asId = route.query.lasId
form.value.orderName = scenicItem.value.name
form.value.dcStart = rzRange.value
const personArr = []
_.each(gateList.value, (item) => {
if (item.count > 0) {
......@@ -433,7 +433,7 @@ function submit() {
}
})
form.value.touristList = personArr
submitOrderScenic(form.value).then(res => {
if (res.data) {
if (res.data.orderId == -400) {
......@@ -495,12 +495,12 @@ function handleGo() {
.ccitemBox {
overflow: auto;
label {
margin: 10px 0;
display: block;
min-height: 30px;
span {
color: #FF8124;
font-family: DIN Alternate;
......@@ -515,12 +515,12 @@ function handleGo() {
font-size: 15px;
color: #666;
margin: 5px 0 10px;
label {
font-size: 16px;
color: #000;
}
span {
font-size: 13px;
}
......@@ -533,7 +533,7 @@ function handleGo() {
.fakeFormItem {
display: flex;
padding: 10px 0;
label {
height: 32px;
font-size: var(--el-form-label-font-size);
......@@ -559,11 +559,11 @@ function handleGo() {
.personIt {
display: flex;
align-items: center;
.mation {
width: 200px;
font-size: 12px;
div {
font-size: 14px;
}
......@@ -572,7 +572,7 @@ function handleGo() {
.father {
position: relative;
}
.son {
......
src/viewsPc/center/myCanKP.vue
......@@ -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)
......
src/viewsPc/components/homeQuick.vue
......@@ -109,7 +109,7 @@ watch(matchId, (val) => {
})
onMounted(() => {
})
function building() {
......@@ -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()
......@@ -186,7 +186,7 @@ function goBooking(n) {
.itemBox_en {
padding: 20px 40px;
p {
margin: 0;
height: 40px;
......@@ -205,7 +205,7 @@ function goBooking(n) {
background: url("@/assets/dance/btn_bg.png") no-repeat left #FFFFFF;
background-size: 100% 100%;
border-radius: 15px;
img {
margin: 0 5%;
}
......@@ -226,20 +226,20 @@ function goBooking(n) {
background-size: cover;
position: relative;
border-radius: 15px;
img {
position: absolute;
top: -30px;
transition: all 0.2s;
}
&:hover {
box-shadow: 0 0 10px #333;
img {
transform: rotateY(180deg);
}
p {
color: #000;
}
......@@ -252,7 +252,7 @@ function goBooking(n) {
}
.item {
font-size: 16px;
img {
width: 50px;
height: 50px
......
src/viewsPc/components/querybackNumber.vue
<template>
<el-dialog
v-model="show" :close-on-click-modal="false" :title="language==0?'背号查询':'Competition Number'" append-to-body
center class="pcloginpop"
close-icon="CircleClose" destroy-on-close
width="460px"
v-model="show" :close-on-click-modal="false" :title="language==0?'背号查询':'Competition Number'" append-to-body
center class="pcloginpop"
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"
clearable
@enter="search" @blur="search" @empty="search"/>
<el-button @click="search" class="btn-lineG" style="color: #fff">{{
language == 0 ? '查询' : 'Search'
}}
<el-input
v-model="query" :placeholder="language==0?'输入会员号 / 姓名查询':'Enter WDSF MIN / Name to Query'"
clearable
@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
: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">
v-model="query2"
:placeholder="language==0?'请输入代表队名称至少两字符':'Enter the representing team name,At least two characters'"
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;
......@@ -195,7 +202,7 @@ function showDetail(name) {
color: #fff;
margin: 20px auto;
background: linear-gradient(90deg, #8623FC, #453DEA);
&:hover {
background: linear-gradient(90deg, #453DEA, #8623FC);
box-shadow: 0 4px 10px #453DEA;
......@@ -212,7 +219,7 @@ function showDetail(name) {
padding: 0 0 20px;
background: #FFFFFF;
box-sizing: border-box;
.info {
.nowName {
font-family: "DIN Alternate";
......@@ -222,13 +229,13 @@ function showDetail(name) {
display: block;
margin: 10px;
}
label {
text-align: right;
font-size: 14px;
padding-left: 7%
}
div {
font-size: 14px;
color: #333;
......@@ -241,17 +248,17 @@ function showDetail(name) {
.nowteamItem {
padding: 10px;
margin: 0 0 10px;
.nowName {
font-size: 15px;
font-weight: bold;
margin-right: 10px
}
.text-bold {
font-weight: bold;
}
.fontsize14 {
font-size: 14px;
}
......@@ -263,7 +270,7 @@ function showDetail(name) {
overflow: auto;
border: 1px solid #e1e1e1;
margin-top: 10px;
li {
padding: 10px;
border-bottom: 1px solid #e1e1e1;
......
src/viewsPc/components/schSearch.vue
<template>
<el-dialog
v-model="show" :close-on-click-modal="false" :title="language==0?'日程查询':'Schedule inquiry'" append-to-body
center class="pcloginpop"
close-icon="CircleClose" destroy-on-close
width="460px"
v-model="show" :close-on-click-modal="false" :title="language==0?'日程查询':'Schedule inquiry'" append-to-body
center class="pcloginpop"
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?'按项目查询':'Query by project' }}</div>
<div @click="type='1'" class="rItem">{{ language==0?'按团队查询':'Query by team' }}</div>
<div @click="type='2'" class="rItem">{{ language==0?'按姓名查询':'Query by name' }}</div>
<div class="rItem" @click="type='0'">{{ language == 0 ? '按项目查询' : 'Query by project' }}</div>
<div class="rItem" @click="type='1'">{{ language == 0 ? '按团队查询' : 'Query by team' }}</div>
<div class="rItem" @click="type='2'">{{ language == 0 ? '按姓名查询' : 'Query by name' }}</div>
</div>
<div v-if="type=='0'">
<div class="flex mt30">
<el-input :placeholder="language==0?'输入项目/ 项目编号查询':'Enter project name or code to Query'" v-model="query" clearable
@enter="search" @blur="search" @empty="search"/>
<el-button @click="search" class="btn-lineG" style="color: #fff">{{
language == 0 ? '查询' : 'Search'
}}
<el-input
v-model="query"
:placeholder="language==0?'输入项目/ 项目编号查询':'Enter project name or code to Query'" clearable
@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" class="mt30">
<el-timeline>
<el-timeline-item placement="top"
v-for="(form, index) in list" :key="index"
:timestamp="form.date + ' ' + form.timeStr"
<el-timeline-item
v-for="(form, index) in list"
:key="index" :timestamp="form.date + ' ' + form.timeStr"
placement="top"
>
<div class="text-primary">
<span v-if="language==1&&form.projectNameEn">{{ form.projectNameEn }}</span>
<span v-else-if="form.projectName">{{ form.projectName }}</span>
<span class="fr">{{form.changCi}} <i v-if="form.changCi">/ </i> {{language==0?form.lun:form.lunEn}} </span>
<span class="fr">{{ form.changCi }} <i
v-if="form.changCi"
>/ </i> {{ language == 0 ? form.lun : form.lunEn }} </span>
</div>
<div>{{form.danceType}}</div>
<div>{{form.address}}</div>
<div>{{ form.danceType }}</div>
<div>{{ form.address }}</div>
</el-timeline-item>
</el-timeline>
</div>
<div v-else>
<el-empty/>
<el-empty />
</div>
</div>
<div v-if="type=='1'">
<div class="flex mt20">
<el-input :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">
{{language == 0 ? '查询' : 'Search' }}
<el-input
v-model="query2"
:placeholder="language==0?'请输入代表队名称至少两字符':'Enter the representing team name,At least two characters'"
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">{{ language == 0 ?'找到多个团体':'Found multiple teams' }}</div>
<div class="groupList" v-if="showGroupList">
<span class="tip">*{{ language == 0 ? '模糊查询' : 'Fuzzy query' }}</span>
<div v-if="showGroupList" class="text-danger text-center">
{{ language == 0 ? '找到多个团体' : 'Found multiple teams' }}
</div>
<div v-if="showGroupList" class="groupList">
<ul>
<li v-for="(item, index) in groupList" @click="showDetail(item)" :key="index">{{item}}
<el-icon class="fr"><ArrowRight /></el-icon>
<li v-for="(item, index) in groupList" :key="index" @click="showDetail(item)">{{ item }}
<el-icon class="fr">
<ArrowRight />
</el-icon>
</li>
</ul>
</div>
<div v-if="teamlist.length>0" class="temell mt20">
<el-collapse accordion>
<el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index">
<el-collapse accordion>
<el-collapse-item v-for="(team,index) in teamlist" :key="index" :name="index" :title="team[0].title">
<el-timeline>
<el-timeline-item placement="top" v-for="(form, index) in team" :key="index">
<div class="text-primary" style="position: relative;top:-15px">
{{ form.date + ' ' + form.timeStr + ' / '+form.address }}
<span v-if="form.lunEn"> / {{ form.lunEn }}</span>
<span v-else-if="form.lun"> / {{ form.lun }}</span>
<span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
</div>
<div class="tname" v-if="form.projectNameEn">{{ form.projectNameEn}}</div>
<div class="tname" v-if="form.projectName">{{ form.projectName }}</div>
<div>{{form.danceType}}</div>
<el-timeline-item v-for="(form, index) in team" :key="index" placement="top">
<div class="text-primary" style="position: relative;top:-15px">
{{ form.date + ' ' + form.timeStr + ' / ' + form.address }}
<span v-if="form.lunEn"> / {{ form.lunEn }}</span>
<span v-else-if="form.lun"> / {{ form.lun }}</span>
<span v-if="form.changCi "> / {{ language == 0 ? '场次' : 'Session' }}：{{ form.changCi }}</span>
</div>
<div v-if="form.projectNameEn" class="tname">{{ form.projectNameEn }}</div>
<div v-if="form.projectName" class="tname">{{ form.projectName }}</div>
<div>{{ form.danceType }}</div>
</el-timeline-item>
</el-timeline>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div v-if="type=='2'">
<div class="flex mt30">
<el-input :placeholder="language==0?'输入选手姓名查询':'Enter the name of the player to Query'"
v-model="query3" clearable
@enter="personalSearch" @blur="personalSearch" @empty="personalSearch"/>
<el-button @click="personalSearch" class="btn-lineG" style="color: #fff">{{
language == 0 ? '查询' : 'Search'
}}
<el-input
v-model="query3"
:placeholder="language==0?'输入选手姓名查询':'Enter the name of the player to Query'" clearable
@blur="personalSearch" @empty="personalSearch" @enter="personalSearch"
/>
<el-button class="btn-lineG" style="color: #fff" @click="personalSearch">{{
language == 0 ? '查询' : 'Search'
}}
</el-button>
</div>
<div v-if="list.length>0" class="temell mt20">
<el-timeline>
<el-timeline-item placement="top" v-for="(team,j) in list" :key="j">
<div v-for="(form, index) in team" :key="index" v-show="index==0">
<div class="text-primary" style="position: relative;top:-15px">
{{ form.date + ' ' + form.timeStr + ' / '+form.address }}
<span v-if="form.lunEn"> / {{ form.lunEn }}</span>
<span v-else-if="form.lun"> / {{ form.lun }}</span>
<span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
</div>
<div class="tname" v-if="form.projectNameEn">{{ form.projectNameEn}}</div>
<div class="tname" v-if="form.projectName">{{ form.projectName }}</div>
<div>{{form.danceType}}</div>
</div>
<div v-for="(form, index) in team" :key="index" v-show="index>0" style="margin: 8px 0 0">
{{ form.date + ' ' + form.timeStr + ' / '+form.address }}
<span v-if="form.lunEn"> / {{ form.lunEn }}</span>
<span v-else-if="form.lun"> / {{ form.lun }}</span>
<span v-if="form.changCi "> / {{ language==0?'场次':'Session' }}：{{ form.changCi }}</span>
</div>
</el-timeline-item>
</el-timeline>
<el-timeline>
<el-timeline-item v-for="(team,j) in list" :key="j" placement="top">
<div v-for="(form, index) in team" v-show="index==0" :key="index">
<div class="text-primary" style="position: relative;top:-15px">
{{ form.date + ' ' + form.timeStr + ' / ' + form.address }}
<span v-if="form.lunEn"> / {{ form.lunEn }}</span>
<span v-else-if="form.lun"> / {{ form.lun }}</span>
<span v-if="form.changCi "> / {{ language == 0 ? '场次' : 'Session' }}：{{ form.changCi }}</span>
</div>
<div v-if="form.projectNameEn" class="tname">{{ form.projectNameEn }}</div>
<div v-if="form.projectName" class="tname">{{ form.projectName }}</div>
<div>{{ form.danceType }}</div>
</div>
<div v-for="(form, index) in team" v-show="index>0" :key="index" style="margin: 8px 0 0">
{{ form.date + ' ' + form.timeStr + ' / ' + form.address }}
<span v-if="form.lunEn"> / {{ form.lunEn }}</span>
<span v-else-if="form.lun"> / {{ form.lun }}</span>
<span v-if="form.changCi "> / {{ language == 0 ? '场次' : 'Session' }}：{{ form.changCi }}</span>
</div>
</el-timeline-item>
</el-timeline>
</div>
</div>
</div>
</el-dialog>
</template>
<script setup>
import {ref} from "vue";
import {ElMessage} from "element-plus";
import { ref } from 'vue'
import { ElMessage } from 'element-plus'
import {
getquerySchedule2Pre,
getqySchedule,
getqySchedule2,
getTeamBackNumber,
getTeamBackNumberPre, queryScheduleSingle
} from "@/apiPc/common";
import {useStorage} from "@vueuse/core/index";
} from '@/apiPc/common'
import { useStorage } from '@vueuse/core/index'
const language = useStorage('language', 0)
const show = ref(false)
......@@ -146,45 +161,49 @@ const query2 = ref('')
const query3 = ref('')
const type = ref('')
const showGroupList = ref(false)
const cptId = ref()
const search = () => {
if (!query.value) {
ElMessage.warning(language.value == 0 ? '请输入搜索关键词' : 'Enter project name or code to Query')
return
}
getqySchedule({projectName: query.value}).then(res => {
if (!res.data||res.data.length==0) {
getqySchedule({ projectName: 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
}).catch(e => {
loading.value = false
})
}
const searchTeam = () => {
teamlist.value = []
if (!query2.value||query2.value.length < 2) {
if (!query2.value || query2.value.length < 2) {
ElMessage.warning(language.value == 0 ? '请输入代表队名称至少两字符' : 'Enter the representing team name,At least two characters')
return
}
loading.value = true
getquerySchedule2Pre({groupName: query2.value}).then(res => {
getquerySchedule2Pre({ groupName: query2.value, cptId: cptId.value }).then(res => {
loading.value = false
if (!res.data||res.data.length==0) {
if (!res.data || res.data.length == 0) {
groupList.value = []
//提示 '未找到结果，请重新查询'
// 提示 '未找到结果，请重新查询'
ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
return
}
groupList.value = res.data
if(groupList.value.length==1){
if (groupList.value.length == 1) {
showDetail(groupList.value[0])
}
if(groupList.value.length>1){
if (groupList.value.length > 1) {
showGroupList.value = true
}
}).catch(e => {
loading.value = false
})
}
const personalSearch = () => {
......@@ -193,19 +212,20 @@ const personalSearch = () => {
return
}
loading.value = true
queryScheduleSingle({query: query3.value}).then(res => {
queryScheduleSingle({ query: query3.value, cptId: cptId.value }).then(res => {
loading.value = false
if (!res.data||res.data.length==0) {
if (!res.data || res.data.length == 0) {
list.value = []
//提示 '未找到结果，请重新查询'
// 提示 '未找到结果，请重新查询'
ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
return
}
list.value = res.data
})
}
const open = (param) => {
console.log(param)
cptId.value = param.cptId
show.value = true
list.value = []
teamlist.value = []
......@@ -217,37 +237,65 @@ const open = (param) => {
defineExpose({
open
})
function showDetail(name) {
query2.value = name
showGroupList.value = false
loading.value = true
getqySchedule2({groupName: name}).then(res => {
getqySchedule2({ groupName: name, cptId: cptId.value }).then(res => {
loading.value = false
teamlist.value = res.data
}).catch(e => {
loading.value = false
})
}
</script>
<style scoped lang="scss">
.tname{font-size: 14px;font-weight: bold;position: relative;top: -8px}
.tip{font-size: 12px;margin: 4px 0 0;display: inline-block;}
.rItem{
<style lang="scss" scoped>
.tname {
font-size: 14px;
font-weight: bold;
position: relative;
top: -8px
}
.tip {
font-size: 12px;
margin: 4px 0 0;
display: inline-block;
}
.rItem {
height: 130px;
cursor: pointer;border: 1px solid #e1e1e1;border-radius: 4px;
width: 350px;text-align: center;line-height: 130px;
padding: 1px; font-size: 30px;color: #fff;
margin: 20px auto;background:linear-gradient(90deg, #8623FC, #453DEA);
&:hover{
background:linear-gradient(90deg, #453DEA, #8623FC);
box-shadow: 0 4px 10px #453DEA;border: none;
cursor: pointer;
border: 1px solid #e1e1e1;
border-radius: 4px;
width: 350px;
text-align: center;
line-height: 130px;
padding: 1px;
font-size: 30px;
color: #fff;
margin: 20px auto;
background: linear-gradient(90deg, #8623FC, #453DEA);
&:hover {
background: linear-gradient(90deg, #453DEA, #8623FC);
box-shadow: 0 4px 10px #453DEA;
border: none;
}
}
.nowteamItem {
width: 100%;border: 1px solid #c8c5ff; margin-top: 20px;
position: relative;border-radius: 4px;padding: 0 0 20px;
width: 100%;
border: 1px solid #c8c5ff;
margin-top: 20px;
position: relative;
border-radius: 4px;
padding: 0 0 20px;
background: #FFFFFF;
box-sizing: border-box;
.info {
.nowName {
font-family: "DIN Alternate";
......@@ -257,13 +305,13 @@ function showDetail(name) {
display: block;
margin: 10px;
}
label {
text-align: right;
font-size: 14px;
padding-left: 7%
}
div {
font-size: 14px;
color: #333;
......@@ -271,14 +319,38 @@ function showDetail(name) {
}
}
}
.temell {
.nowteamItem{padding: 10px;margin: 0 0 10px;
.nowName{font-size: 15px;font-weight: bold;margin-right: 10px}
.text-bold{font-weight: bold;}
.fontsize14{font-size: 14px;}
.nowteamItem {
padding: 10px;
margin: 0 0 10px;
.nowName {
font-size: 15px;
font-weight: bold;
margin-right: 10px
}
.text-bold {
font-weight: bold;
}
.fontsize14 {
font-size: 14px;
}
}
}
.groupList{max-height: 70vh;overflow: auto;border: 1px solid #e1e1e1;margin-top: 10px;
li{padding: 10px;border-bottom: 1px solid #e1e1e1;cursor: pointer;}
.groupList {
max-height: 70vh;
overflow: auto;
border: 1px solid #e1e1e1;
margin-top: 10px;
li {
padding: 10px;
border-bottom: 1px solid #e1e1e1;
cursor: pointer;
}
}
</style>
......
src/viewsPc/index.vue
......@@ -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;
......
src/viewsPc/index_en.vue
......@@ -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;
......
src/viewsPc/match/components/addCoach.vue
......@@ -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" />
......
src/viewsPc/match/components/addCoach_en.vue
......@@ -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
......
src/viewsPc/match/components/addSportman_en.vue
......@@ -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">
......
src/viewsPc/match/components/addWdsf.vue
......@@ -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">
......
src/viewsPc/match/components/allSportsmanListForPersonal.vue
......@@ -157,7 +157,7 @@ const emit = defineEmits(['transfer'])
const data = reactive({
query: {
label: '0',
pageSize: 10,
pageSize: 9999,
pageNum: 1
},
tableData: [],
......
src/viewsPc/match/components/matchPerformance.vue 0 → 100644
<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>
src/viewsPc/match/components/quick-row.vue
<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
}
}
......
src/viewsPc/match/detail_en.vue
......@@ -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
......
src/viewsPc/register/personal.vue
......@@ -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">
......
src/viewsPc/saiC/index.vue
......@@ -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>
......
src/viewsPc/saiC/view.vue
......@@ -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>
......
vite.config.js
......@@ -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/, '')
},
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!