Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
c0c59ce7 by 杨炀
Options

Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev 

# Conflicts:
#	vite.config.js
2 parents 65d4b1e1 6c6e5fb9
Expand all
Inline Side-by-side
Showing 15 changed files with 571 additions and 131 deletions
src/apiPc/booking.js
......@@ -237,6 +237,15 @@ export function getBaseInfoByActiveId(id) {
})
}
export function vehicleConfigList(params) {
return request({
url: `/ota/vehicleConfig/list`,
method: 'get',
params
})
}
export function checkRoomPayByUserId(id) {
return request({
url: `/ota/norder/checkRoomPayByUserId`,
......@@ -648,9 +657,9 @@ export function getTicketOrderInfo(params) {
})
}
export function getGateListByLasId(params) {
export function getVehicleByCheckIn(params) { // activityId,category,checkIn
return request({
url: `/ota/scenicConfig/getGateListByLasId`,
url: `/ota/activityVehicle/getVehicleByCheckIn`,
method: 'get',
params
})
......@@ -670,3 +679,34 @@ export function checkPurchasedCustomers(data) {
data
})
}
// 接机
export function getVehicleMap(params) { // activityId
return request({
url: `/ota/activityVehicle/getVehicleMap`,
method: 'get',
params
})
}
export function getVehicleMa1p(params) { // activityId
return request({
url: `/ota/activityVehicle/getVehicleMap`,
method: 'get',
params
})
}
// 旅游
export function getGateListByLasId(params) { // scenicDate,lasId
return request({
url: `/ota/scenicConfig/getGateListByLasId`,
method: 'get',
params
})
}
// 旅游
......
src/routerPc/en.js
......@@ -404,6 +404,18 @@ export const constantRoutes = [
meta: { title: 'Hotel Reservation' }
},
{
path: 'car/:cptId',
component: () => import('@/viewsPc/booking/car'),
name: 'car',
meta: { title: 'Vehicle Reservation' }
},
{
path: 'carList/:cptId',
component: () => import('@/viewsPc/booking/carList'),
name: 'carList',
meta: { title: 'carList' }
},
{
path: 'car/:cptId/:id',
component: () => import('@/viewsPc/booking/carOrder'),
name: 'carOrder',
......@@ -416,12 +428,6 @@ export const constantRoutes = [
meta: { title: 'Hotel Reservation' }
},
{
path: 'car/:cptId',
component: () => import('@/viewsPc/booking/car'),
name: 'car',
meta: { title: 'Vehicle Reservation' }
},
{
path: 'dinner/:cptId',
component: () => import('@/viewsPc/booking/dinner'),
name: 'dinner',
......
src/viewsPc/booking/carList.vue 0 → 100644
<template>
<div>
<div class="banner">
<img v-if="language==0" src="@/assets/booking/cl_text_c.png">
<img v-else src="@/assets/booking/cl_text_e.png">
</div>
<div class="box">
<div class="searchBar">
<el-input v-model="query.name" :placeholder="language==0?'请输入关键字搜索':'Search'" class="no-border" />
<el-button class="btn-lineG" icon="search" size="large" type="primary" @click="getVehicleByCheckIn">
{{ language == 0 ? '搜索' : 'Search' }}
</el-button>
</div>
</div>
<div v-loading="loading" class="box">
<div v-for="(h,index) in list" :key="index" class="routeItem">
<el-row :gutter="20" align="middle" class="w100">
<el-col :lg="2" :sm="6">
<div class="index">{{ language == 0 ? '路线' : 'Route' }}{{ index + 1 }}
</div>
</el-col>
<el-col :lg="6">
<p class="esp text-center">{{ h.checkIn }}</p>
</el-col>
<el-col :lg="4" :sm="6" class="text-center">
<img class="mauto w40px" src="@/assets/booking/wf.png">
</el-col>
<el-col :lg="6">
<p class="esp text-center">{{ h.checkOut }}</p>
</el-col>
<el-col :lg="3" :sm="12">
<div v-if="language==0" class="price">
¥
<span>{{ h.upPrice }}</span>
</div>
<div v-else class="price">
€
<span>{{ h.upPriceEn }}</span>
</div>
</el-col>
<el-col :lg="3" :sm="12">
<el-button class="btn-lineG w100" round type="primary" @click="goOrder(h)">
{{ language == 0 ? '我要预订' : 'Select' }}
</el-button>
</el-col>
</el-row>
</div>
<el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description="" />
<div style="height: 50px" />
</div>
</div>
</template>
<script setup>
import { onMounted, ref } from '@vue/runtime-core'
import * as booking from '@/apiPc/booking'
import { useRouter, useRoute } from 'vue-router'
import { useStorage } from '@vueuse/core/index'
import useUserStore from '@/store/modules/user'
const user = useUserStore().user
const router = useRouter()
const route = useRoute()
const language = useStorage('language', 0)
const query = ref({})
const activeName = ref(0)
const cptId = ref('')
const list = ref([])
const loading = ref(false)
onMounted(() => {
query.value.activityId = route.query.activityId
query.value.checkIn = route.query.checkIn
query.value.checkOut = route.query.checkOut
query.value.category = route.query.category
// if (language.value==0)
// getList()
getVehicleByCheckIn()
})
function getList() {
// if (language.value!=0)return
loading.value = true
booking.getActivityCarList(query.value).then(res => {
list.value = res.rows
loading.value = false
}).catch(e => {
loading.value = false
})
}
async function getVehicleByCheckIn() {
loading.value = true
const res = await booking.getVehicleByCheckIn(query.value)
list.value = res.data || []
loading.value = false
}
function goOrder(item, car) {
if (!user) {
useUserStore().setReLogin()
return
}
router.push({
name: 'carOrder',
params: {
id: item.id
},
query: {
item: encodeURIComponent(JSON.stringify(item))
}
})
}
</script>
<style lang="scss" scoped>
.hotel {
margin-bottom: 20px;
cursor: pointer;
.index {
display: flex;
font-weight: 500;
padding-left: 20px;
font-size: 18px;
align-items: center;
img {
margin-left: 15px;
}
}
p {
font-weight: 500;
font-size: 24px;
color: #000000;
}
&:hover .el-card {
box-shadow: 0 0 10px #aaa;
}
}
.hotel:nth-child(7n) .index {
color: #009E96;
}
.hotel:nth-child(7n+1) .index {
color: #FF8124;
}
.hotel:nth-child(7n+2) .index {
color: #E4007F;
}
.hotel:nth-child(7n+3) .index {
color: #0068B7;
}
.hotel:nth-child(7n+4) .index {
color: #32B16C;
}
.hotel:nth-child(7n+5) .index {
color: #920783;
}
.hotel:nth-child(7n+6) .index {
color: #00B7EE;
}
.banner {
height: 140px;
background-size: cover;
text-align: center;
background: url("@/assets/booking/cl_bg.png") center;
display: flex;
align-items: center;
justify-content: center;
img {
display: block;
margin: -30px auto 0;
width: auto;
}
}
.searchBar {
position: relative;
top: -30px;
background: #FFFFFF;
display: flex;
padding: 20px;
border-radius: 10px;
}
.no-border {
border: none;
background: #F5F7F9;
:deep(.el-input__wrapper) {
border: none;
box-shadow: none;
background: #F5F7F9;
}
}
.starBox {
img {
display: inline-block;
margin-right: 4px
}
}
.tagbox {
margin: 15px 0;
a {
color: #AFB5B9;
font-size: 12px;
}
span {
border-radius: 13px;
font-size: 12px;
padding: 4px 10px;
margin-right: 10px;
font-weight: 400;
}
span:nth-child(4n) {
background: rgba(50, 177, 108, 0.2);
color: rgba(50, 177, 108, 1);
}
span:nth-child(4n+1) {
background: rgba(243, 152, 0, 0.2);
color: rgba(243, 152, 0, 1);
}
span:nth-child(4n+2) {
background: rgba(0, 160, 233, 0.2);
color: rgba(0, 160, 233, 1);
}
span:nth-child(4n+3) {
background: rgba(247, 64, 166, 0.2);
color: rgba(247, 64, 166, 1);
}
}
.name.flex {
align-items: center;
}
.name .tagbox {
margin: 0 0 0 15px;
}
.room {
background: #FAFBFD;
margin: 20px 0 0;
padding: 20px;
border: 1px solid #E5E5E5;
.name {
font-size: 20px;
margin: 0 0 10px;
}
.roomImg {
aspect-ratio: 16/9;
border-radius: 10px;
overflow: hidden;
img {
width: 100%;
object-fit: cover;
object-position: center;
height: 100%;
}
}
.bg-lineg {
margin: auto;
border-radius: 10px;
text-align: center;
padding: 7px 2px 2px;
font-size: 24px;
width: 66px;
cursor: pointer;
div {
background: #fff;
font-size: 13px;
border-radius: 20px;
padding: 0 10px;
color: #453DEA;
font-weight: 500;
}
}
}
.routeItem {
background: #fff;
border-radius: 10px;
margin: 0 0 20px;
padding: 10px 20px;
box-shadow: 0 0 6px #eee;
.price {
color: #FF8124;
font-size: 24px;
span {
font-size: 36px;
font-family: "DIN Alternate"
}
}
}
</style>
src/viewsPc/booking/component/choosePerson.vue
<template>
<el-dialog v-model="show" width="500" :title="languageFormat(language, '出行人信息', 'Travelers')" center
append-to-body>
<el-button type="primary" plain @click="addPeopl">{{ languageFormat(language, "新增", "Add") }}</el-button>
<el-dialog
v-model="show" :title="languageFormat(language, '出行人信息', 'Travelers')" append-to-body center
width="500"
>
<el-button plain type="primary" @click="addPeopl">{{ languageFormat(language, "新增", "Add") }}</el-button>
<el-radio-group v-model="personId">
<div v-for="(it, index) in personList" :key="index" class="e_item">
<el-radio border :value="it.id" :disabled="hasPersonIds?.indexOf(it.id)!=-1">
<el-radio :disabled="hasPersonIds?.indexOf(it.id)!=-1" :value="it.id" border>
<div class="name">{{ it.name }}</div>
<div class="code">
......@@ -27,23 +29,23 @@
</el-dialog>
<el-dialog v-model="showAdd" :title="language ==0?'新增出行人':'Add traveler'" center append-to-body>
<el-dialog v-model="showAdd" :title="language ==0?'新增出行人':'Add traveler'" append-to-body center>
<el-form
ref="formRef" :model="form" label-width="100px" size="large"
style="margin: 80px"
>
<el-form-item :label="language==0?'姓名':'name'" prop="name" required :show-message="false">
<el-input v-model="form.name" :placeholder="language==0?'请输入':'Please input'"/>
<el-form-item :label="language==0?'姓名':'name'" :show-message="false" prop="name" required>
<el-input v-model="form.name" :placeholder="language==0?'请输入':'Please input'" />
</el-form-item>
<el-form-item :label="language==0?'证件类型':'ID Type'" prop="idcType" required :show-message="false">
<el-form-item :label="language==0?'证件类型':'ID Type'" :show-message="false" prop="idcType" required>
<el-select v-model="form.idcType" :placeholder="language==0?'请选择':'Please choose'">
<el-option :label="language==0?'身份证':'Identity card'" value="0"/>
<el-option :label="language==0?'护照':'Passport'" value="1"/>
<el-option :label="language==0?'其他':'Other'" value="2"/>
<el-option :label="language==0?'身份证':'Identity card'" value="0" />
<el-option :label="language==0?'护照':'Passport'" value="1" />
<el-option :label="language==0?'其他':'Other'" value="2" />
</el-select>
</el-form-item>
<el-form-item :label="language==0?'证件号':'ID number'" prop="idCard" required :show-message="false">
<el-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'"/>
<el-form-item :label="language==0?'证件号':'ID number'" :show-message="false" prop="idCard" required>
<el-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'" />
</el-form-item>
</el-form>
......@@ -58,15 +60,15 @@
</template>
<script setup>
import {aadSceneCustomer, checkSceneCustomer, getMyFriends} from '/@/apiPc/booking'
import {languageFormat} from '/@/viewsPc/seat/utils/language'
import {onMounted, ref} from 'vue'
import {useStorage} from '@vueuse/core/index'
import { aadSceneCustomer, checkSceneCustomer, getMyFriends } from '/@/apiPc/booking'
import { languageFormat } from '/@/viewsPc/seat/utils/language'
import { onMounted, ref } from 'vue'
import { useStorage } from '@vueuse/core/index'
import _ from 'lodash'
import {getCurrentInstance} from '@vue/runtime-core'
import { getCurrentInstance } from '@vue/runtime-core'
const emit = defineEmits(['addPerson'])
const {proxy} = getCurrentInstance()
const { proxy } = getCurrentInstance()
const show = ref(false)
const showAdd = ref(false)
......@@ -96,17 +98,6 @@ const addPeopl = () => {
const addPerson = () => {
const person = _.find(personList.value, (it) => it.id == personId.value)
checkSceneCustomer({
customerId: person.id,
gateType: currParams.gateType
}).then((res) => {
if (res.data == 201) {
proxy.$modal.msgError(language.value == 0 ? '护照只能购买成人票' : 'Passport can only buy adult tickets')
} else if (res.data == 202) {
proxy.$modal.msgError(language.value == 0 ? '此身份证不能购买老人票' : 'This ID cannot buy senior tickets')
} else if (res.data == 203) {
proxy.$modal.msgError(language.value == 0 ? '此身份证不能购买儿童票' : 'This ID cannot buy child tickets')
} else {
show.value = false
emit('addPerson', Object.assign(currParams, {
customerId: person.id,
......@@ -114,8 +105,26 @@ const addPerson = () => {
idcType: person.idcType,
idCard: person.idCard
}))
}
})
// checkSceneCustomer({
// customerId: person.id,
// gateType: currParams.gateType
// }).then((res) => {
// if (res.data == 201) {
// proxy.$modal.msgError(language.value == 0 ? '护照只能购买成人票' : 'Passport can only buy adult tickets')
// } else if (res.data == 202) {
// proxy.$modal.msgError(language.value == 0 ? '此身份证不能购买老人票' : 'This ID cannot buy senior tickets')
// } else if (res.data == 203) {
// proxy.$modal.msgError(language.value == 0 ? '此身份证不能购买儿童票' : 'This ID cannot buy child tickets')
// } else {
// show.value = false
// emit('addPerson', Object.assign(currParams, {
// customerId: person.id,
// name: person.name,
// idcType: person.idcType,
// idCard: person.idCard
// }))
// }
// })
}
const submit = () => {
......@@ -151,7 +160,7 @@ defineExpose({
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.el-radio-group {
display: block;
}
......
src/viewsPc/booking/ticket/confirmOrder.vue
<template>
<el-card class="container">
<div v-loading="loading">
<div class="title">
<div class="title father">
{{ languageFormat(language, "订单确认", "Order confirmation") }}
<span class="son" @click="handelUp">{{ language == 0 ? '上一步' : 'Go back' }}</span>
</div>
<div class="content pd20">
<el-row gutter="20">
......@@ -21,12 +22,15 @@
｜ {{ TickForm2.ticketName }}
</div>
<div v-if="TickForm2.ticketType=='0'" class="address">{{ language==0?'剩余数量':'Remaining Quantity' }}： {{ leftCount }}</div>
<div v-if="TickForm2.ticketType=='0'" class="address">{{
language == 0 ? '剩余数量' : 'Remaining Quantity'
}}： {{ leftCount }}
</div>
</div>
<div class="ticket_info mb20">
<div class="tit_box">
<div class="line"/>
<div class="line" />
<div class="txt">
{{ languageFormat(language, "订票信息", "Ticket Info") }}
</div>
......@@ -37,30 +41,36 @@
<div v-if="TickForm2.ticketType == '1'">
<el-form-item :label="language == 0 ? '桌号' : 'Table'">
<el-popover placement="right" :width="400" trigger="hover">
<template #reference>
<div class="text-primary underline pointer" @click="showImg">
{{ language == 0 ? '查看区域布局' : ' View Area Layout' }}
</div>
</template>
<el-image :src="fillImgUrl(tickImg)" style="width: 100%;"
:preview-src-list="[fillImgUrl(tickImg)]"/>
</el-popover>
<!-- <el-popover :width="400" placement="right" trigger="hover">-->
<!-- <template #reference>-->
<!-- <div class="text-primary underline pointer" @click="showImg">-->
<!-- {{ language == 0 ? '查看区域布局' : ' View Area Layout' }}-->
<!-- </div>-->
<!-- </template>-->
<!-- <el-image-->
<!-- :preview-src-list="[fillImgUrl(tickImg)]" :src="fillImgUrl(tickImg)"-->
<!-- style="width: 100%;"-->
<!-- />-->
<!-- </el-popover>-->
<!-- -->
<el-radio-group v-model="currDesk">
<el-radio-button v-for="(it, index) in deskList" :key="index" :label="it.deskNo" :value="it"
:disabled="it.status!=0"/>
<el-radio-button
v-for="(it, index) in deskList" :key="index" :disabled="it.status!=0" :label="it.deskNo"
:value="it"
/>
</el-radio-group>
</el-form-item>
<el-form-item :label="language == 0 ? '座位号' : 'Seat'">
<el-checkbox-group v-model="currSeat">
<el-checkbox-button v-for="(it, index) in currDesk?.seatList" :key="index" :label="it.seatNo"
:value="it" :disabled="it.status!=0"/>
<el-checkbox-button
v-for="(it, index) in currDesk?.seatList" :key="index" :disabled="it.status!=0"
:label="it.seatNo" :value="it"
/>
</el-checkbox-group>
</el-form-item>
<el-form-item :label="language == 0 ?'已选座位号':'Selected Seat'">
<el-tag class="mr10" v-for="(s,index) in currSeat" :key="s.id" closable @close="delSeat(s,index)">
<el-tag v-for="(s,index) in currSeat" :key="s.id" class="mr10" closable @close="delSeat(s,index)">
{{ s.deskNo }} - {{ s.seatNo }}
</el-tag>
</el-form-item>
......@@ -96,7 +106,7 @@
</div>
<div class="idcard">{{ it.idCard }}</div>
</div>
<el-checkbox :value="it.id" :disabled="!!it.disabled"/>
<el-checkbox :disabled="!!it.disabled" :value="it.id" />
</div>
</el-checkbox-group>
</div>
......@@ -112,7 +122,7 @@
<el-col :lg="8" class="right">
<div class="tit_box">
<div class="line"/>
<div class="line" />
<div class="txt">
{{ languageFormat(language, "订单明细", "Order summary") }}
</div>
......@@ -123,7 +133,7 @@
<div class="time">
{{ language == 0 ? '票价' : 'Cost Ticket' }}
</div>
<p/>
<p />
<div class="ticket">
{{ language == 0 ? TickForm2.price : TickForm2.priceEn }}
<span> {{ language == 0 ? '元' : 'Euro' }}</span>
......@@ -143,6 +153,15 @@
</div>
</div>
</div>
<!-- 场馆布局图-->
<div style="margin-top: 95px">
<el-image
:preview-src-list="[fillImgUrl(tickImg)]"
:src="fillImgUrl(tickImg)"
style="width: 100%;"
/>
</div>
</el-col>
</el-row>
</div>
......@@ -166,7 +185,7 @@
</template>
<script setup>
import {ref, computed, onMounted} from 'vue'
import { ref, computed, onMounted } from 'vue'
import {
customerListApi,
submitOrderTicket,
......@@ -176,12 +195,12 @@ import {
checkPurchasedCustomers,
getDeskInfo
} from '@/apiPc/booking'
import {ElMessage, ElMessageBox} from 'element-plus'
import {languageFormat} from '@/viewsPc/seat/utils/language.js'
import { ElMessage, ElMessageBox } from 'element-plus'
import { languageFormat } from '@/viewsPc/seat/utils/language.js'
import useUserStore from '/@/store/modules/user'
import {useStorage} from '@vueuse/core/index'
import { useStorage } from '@vueuse/core/index'
import _ from 'lodash'
import {useRoute, useRouter} from 'vue-router'
import { useRoute, useRouter } from 'vue-router'
const useStore = useUserStore()
......@@ -243,12 +262,10 @@ onMounted(() => {
getDeskInfo({
atstId: route.params.latstId
}).then(res => {
deskList.value = res.data
deskList.value = res.data?.sort((a, b) => a.deskNo - b.deskNo)
currDesk.value = res.data[0]
})
}
// 普通票
else {
} else { // 普通票
getListByAtstId({
atstId: route.params.latstId
}).then(res => {
......@@ -321,7 +338,7 @@ async function paymentHandle() {
confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
type: 'warning'
}).then(async () => {
}).then(async() => {
try {
const orderCustomerList = []
_.each(orderForm.value.customerIds, (id, index) => {
......@@ -390,7 +407,7 @@ async function paymentHandle() {
}
async function getDetail() {
const res = await getTicketInfoByActivityId({activityId: orderForm.value.activeId})
const res = await getTicketInfoByActivityId({ activityId: orderForm.value.activeId })
TickForm.value = res.data
}
......@@ -401,8 +418,8 @@ function addPeopl() {
})
}
const showImg = () => {
function handelUp() {
router.go(-1)
}
</script>
......@@ -677,6 +694,16 @@ div {
}
}
.father {
position: relative;
}
.son {
position: absolute;
left: 10px;
cursor: pointer
}
@media screen and (max-width: 768px) {
.container {
width: 100%;
......
src/viewsPc/booking/ticket/index.vue
......@@ -2,7 +2,7 @@
<div>
<!-- top -->
<div class="container top">
<img :src="fillImgUrl(matchForm.ticketImg)" class="cover_img">
<img :src="fillImgUrl(matchForm.ticketImg)" alt="" class="cover_img">
<div class="info">
<div class="title">{{ matchForm.name }}</div>
<div class="time">
......@@ -93,7 +93,7 @@
<span
v-if="currVenue?.images"
style="color: #493ceb;cursor:pointer;font-weight:600;font-size: 14px"
@click="showUrl=currVenue.images; show=true"
@click="handleImage"
> <span style="color: red;font-size: 18px">*</span>
{{
language == 0 ? '点击查看场馆布局' : 'View Venue Layout'
......@@ -140,7 +140,7 @@
<span v-else>{{
language == 0 ? '夜间场' : 'Night'
}}</span>
<!-- {{ key=='1000'?'日间场':'夜间场' }}-->
<!-- {{ key=='1000'?'日间场':'夜间场' }}-->
</div>
</div>
</div>
......@@ -227,8 +227,11 @@
<div class="container bottom">
<div style="display: flex">
<div :class="{'bg':active==1}" class="buBg" @click="active=1">{{ language==0?'购票说明':'Notice' }}</div>
<div :class="{'bg' :active==2}" class="buBg" @click="active=2">{{ language==0?'购票须知':'Instructions' }}</div>
<div :class="{'bg':active==1}" class="buBg" @click="active=1">{{ language == 0 ? '购票说明' : 'Notice' }}</div>
<div :class="{'bg' :active==2}" class="buBg" @click="active=2">{{
language == 0 ? '购票须知' : 'Instructions'
}}
</div>
</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" />
......@@ -250,7 +253,8 @@ import {
getTicketListApi,
checkNonPayment,
getStadiumList,
getActivityTypeVoListByLatsId
getActivityTypeVoListByLatsId,
getBaseInfoByActiveId
} from '@/apiPc/booking'
import { dayjs } from 'element-plus'
......@@ -290,6 +294,7 @@ const venueList = ref([])
const tickList = ref([])
const currVenue = ref(null)
const currTick = ref(null)
const matchData = ref({})
watch(show, (val) => {
if (!val) {
......@@ -316,7 +321,7 @@ getTicketList()
async function getTicketList() {
const res = await getTicketListApi({
activityId: activeId.value, isView: 1
activityId: activeId.value, status: 1
})
tickClass.value = res.rows
if (tickClass.value.length > 0) {
......@@ -418,6 +423,20 @@ function toSelectClosed() {
type: 'warning'
})
}
async function getmatchData() {
const res = await getBaseInfoByActiveId(route.params.activeId)
matchData.value = res.data
console.log(res)
}
function handleImage() {
// ticketImg
showUrl.value = matchData.value.ticketLayout
show.value = true
}
getmatchData()
</script>
<style lang="scss" scoped>
......@@ -455,8 +474,8 @@ function toSelectClosed() {
margin-top: 26px;
.cover_img {
width: 390px;
height: 517px;
width: 500px;
height: 667px;
object-fit: fill;
margin-right: 36px;
}
......
src/viewsPc/components/homeQuick.vue
<template>
<div v-if="language == 0" class="itemBox">
<el-row :gutter="20">
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item" @click="popRemark(1)"><img src="@/assets/dance/btn01.png">酒店预订</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn02.png">车辆预订</div>
</el-col>
<!-- <el-col :sm="12" :lg="8" :xs="12">-->
<!-- <div class="item" @click="popRemark(3)"><img src="@/assets/dance/btn03.png">餐饮预订</div>-->
<!-- </el-col>-->
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item" @click="popRemark(8)"><img src="@/assets/dance/btn08.png">旅游服务</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item" @click="popRemark(0)"><img src="@/assets/dance/btn04.png">票务预订</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item" @click="popRemark(4)"><img src="@/assets/dance/btn05.png">化妆预约</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item" @click="popRemark(5)"><img src="@/assets/dance/btn06.png">拍照预约</div>
</el-col>
</el-row>
</div>
<div v-else class="itemBox_en">
<el-row :gutter="20">
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item_en" @click="popRemark(1)"><img src="@/assets/dance/btn01.png">
<p>HOTEL RESERVATION</p>
</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item_en" @click="popRemark(2)"><img src="@/assets/dance/btn02.png">
<p>TRANSPORTATION RESERVATION</p>
</div>
</el-col>
<!-- <el-col :sm="12" :lg="8" :xs="12">-->
<!-- <div class="item_en" @click="popRemark(3)"><img src="@/assets/dance/btn03.png">-->
<!-- <p>DINING RESERVATION</p>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :sm="12" :lg="8" :xs="12">
<!-- <el-col :sm="12" :lg="8" :xs="12">-->
<!-- <div class="item_en" @click="popRemark(3)"><img src="@/assets/dance/btn03.png">-->
<!-- <p>DINING RESERVATION</p>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :lg="8" :sm="12" :xs="12">
<div class="item_en" @click="popRemark(8)"><img src="@/assets/dance/btn08.png">
<p>TRAVEL SERVICE</p>
</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item_en" @click="popRemark(0)">
<img src="@/assets/dance/btn04.png">
<p>TICKET BOOKING</p>
</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item_en" @click="popRemark(4)"><img src="@/assets/dance/btn05.png">
<p>MAKEUP APPOINTMENT</p>
</div>
</el-col>
<el-col :sm="12" :lg="8" :xs="12">
<el-col :lg="8" :sm="12" :xs="12">
<div class="item_en" @click="popRemark(5)"><img src="@/assets/dance/btn06.png">
<p>PHOTOGRAPHY APPOINTMENT</p>
</div>
......@@ -114,7 +114,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.')
return
}
function popRemark(type) {
......@@ -173,14 +172,14 @@ function goBooking(n) {
router.push({ path: `/booking/photography/${props.matchId}` })
break
case 8:
// 酒店
// 旅游
router.push({ path: `/booking/travel/${props.matchId}` })
break
}
}
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.itemBox {
padding: 20px 40px;
}
......@@ -248,9 +247,16 @@ function goBooking(n) {
}
@media screen and (max-width: 768px) {
.itemBox,.itemBox_en{padding: 0 20px 20px}
.item{font-size: 16px;
img{width: 50px;height: 50px}
.itemBox, .itemBox_en {
padding: 0 20px 20px
}
.item {
font-size: 16px;
img {
width: 50px;
height: 50px
}
}
}
</style>
......
src/viewsPc/components/orderRemark.vue
<template>
<el-dialog :title="title" v-model="show" width="400px" @close="close">
<el-dialog v-model="show" :title="title" destroy-on-close width="400px" @close="close">
<div>
<h2 class="text-warning text-center" v-if="cptName">{{cptName}}</h2>
<h2 v-if="cptName" class="text-warning text-center">{{ cptName }}</h2>
<div v-if="type==1" class="plr20" v-html="form.reserveDes"></div>
<div v-if="type==2" class="plr20" v-html="form.reserveDesCar"></div>
<div v-if="type==3" class="plr20" v-html="form.reserveDesFood"></div>
<div v-if="type==4" class="plr20" v-html="form.reserveDesMeal"></div>
<div v-if="type==5" class="plr20" v-html="form.reserveDesPhoto"></div>
<div v-if="type==0" class="plr20" v-html="form.reserveDesTitck"></div>
<div v-if="type==8" class="plr20" v-html="form.reserveDesTravel"></div>
<div v-if="type==1" class="plr20" v-html="form.reserveDes" />
<div v-if="type==2" class="plr20" v-html="form.reserveDesCar" />
<div v-if="type==3" class="plr20" v-html="form.reserveDesFood" />
<div v-if="type==4" class="plr20" v-html="form.reserveDesMeal" />
<div v-if="type==5" class="plr20" v-html="form.reserveDesPhoto" />
<div v-if="type==0" class="plr20" v-html="form.reserveDesTitck" />
<div v-if="type==8" class="plr20" v-html="form.reserveDesScenic" />
</div>
<template #footer>
<div class="dialog-footer text-center">
<el-button type="primary" class="btn-lineG w200px" round @click="ok">{{language==0?'确定':'Confirm'}}</el-button>
<el-button class="btn-lineG w200px" round type="primary" @click="ok">{{ language == 0 ? '确定' : 'Confirm' }}
</el-button>
</div>
</template>
</el-dialog>
</template>
<script setup>
import {getBaseInfoByActiveId} from "@/apiPc/booking";
import {getCurrentInstance} from "@vue/runtime-core";
import {useStorage} from "@vueuse/core/index";
const emit = defineEmits([ 'submit'])
const {proxy} = getCurrentInstance()
const language= useStorage('language',0)
import useUserStore from "@/store/modules/user";
import { getBaseInfoByActiveId } from '@/apiPc/booking'
import { getCurrentInstance } from '@vue/runtime-core'
import { useStorage } from '@vueuse/core/index'
const emit = defineEmits(['submit'])
const { proxy } = getCurrentInstance()
const language = useStorage('language', 0)
import useUserStore from '@/store/modules/user'
const user = useUserStore().user
const title = ref('')
const cptName = ref('')
......@@ -48,16 +51,18 @@ defineExpose({
function getData() {
console.log(matchId)
getBaseInfoByActiveId(matchId).then(res=>{
getBaseInfoByActiveId(matchId).then(res => {
form.value = res.data || {}
console.log(form.value)
}).catch(err=>{
}).catch(err => {
console.log(err)
})
}
function close() {
show.value = false
}
function ok() {
// type
show.value = false
......@@ -70,6 +75,6 @@ function ok() {
}
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
</style>
......
vite.config.js
......@@ -70,8 +70,8 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
},
'/dev-api/ztx-match': {
// target: 'http://192.168.1.118:8081',
target: 'https://wdsfwuxicenter.com/stage-api/',
target: 'http://192.168.1.118:8081',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
......@@ -82,8 +82,8 @@ export default defineConfig(({ mode, command }) => {
},
'/dev-api': {
// target: 'http://192.168.1.118:8081/',
// target: 'http://192.168.1.130:8081',
target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'http://192.168.1.118:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
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!