Skip to content

jijin / dance-pc

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

no message

1 parent 2ef19ff1
Inline Side-by-side
Showing 3 changed files with 110 additions and 78 deletions
src/viewsPc/booking/pay.vue
......@@ -118,19 +118,19 @@
<div class="leftboderTT">{{ language == 0 ? '购票信息' : 'Ticket Information' }}</div>
<div class="border-info mt20">
<h3>{{ matchForm.name }}</h3>
<el-row>
<el-col>
<p>
{{ language == 0 ? '地址' : 'Address' }}：
{{ matchForm.address }}
</el-col>
<el-col>
{{ form?.extJson?.atName }}
{{ form?.extJson?.atsName }}
{{ form?.extJson?.sessionType=='1000'?'日间场':'夜间场' }}
{{ form?.extJson?.ticketName }}
</p>
<p>
{{ form?.extJson?.atName }} ｜
{{ form?.extJson?.atsName }} ｜
<span v-if="form?.extJson?.sessionType == '1000'">{{ language==0?'日间场':'Day' }}</span>
<span v-else>{{ language==0?'夜间场':'Night' }}</span>
{{ form?.extJson?.ticketName }} ｜
{{ form?.num }}{{ language == 0 ? '张' : 'Tickets' }}
</el-col>
</el-row>
</p>
</div>
</div>
<div v-if="type == 'travel'">
......@@ -161,7 +161,7 @@
language == 0 ? '联系方式' : 'Contact Information'
}}：{{ form.phone }}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24" />
<el-col :lg="8" :md="12" :sm="12" :xs="24"/>
</el-row>
<el-row v-if="type == 'car'">
<el-col :lg="12" :md="12" :sm="12" :xs="24">
......@@ -265,34 +265,34 @@
<el-col :span="24">{{ language == 0 ? '备注' : 'Remarks' }}：{{ form.remarks }}</el-col>
</el-row>
<el-row v-if="type == 'ticket'" style="width: 100%">
<el-row v-for="(v,i) in form.extJson?.orderCustomerList" :key="i" style="width: 100%">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{ v.name }}
</div>
<el-col :lg="12">
{{ language == 0 ? '联系人' : 'Contact' }}：{{form.contacts}}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{ v.idCard }}
</div>
<el-col :lg="12">
{{ language == 0 ? '联系方式' : 'Contact' }}：{{ form.phone }}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div v-if="language == 0 ">
￥ {{ form.price }} /张
</div>
<div v-else>
€ {{ form.priceEn }} /Tickets
</div>
<el-row v-for="(v,i) in form.extJson?.orderCustomerList" :key="i" style="width: 100%">
<el-col :lg="12" :md="12" :sm="12" :xs="24">
{{ v.name }} -
<span class="text-gray">{{ v.idCard }}</span>
</el-col>
<el-col :lg="12" :md="12" :sm="12" :xs="24" class="text-right">
<span class="text-primary" v-if="language == 0 ">￥ {{ form.price }}</span>
<span v-else>€ {{ form.priceEn || 0}}</span>
</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' }}：{{ form.num }}{{ language == 0 ? '张' : 'Tickets' }}
{{ language == 0 ? '购票数量' : 'Number of tickets purchased' }}：{{
form.num
}}{{ language == 0 ? '张' : 'Tickets' }}
</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
{{ language == 0 ? '联系方式' : 'Contact Information' }}：{{ form.phone }}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<el-col :lg="8" :md="12" :sm="12" :xs="24" class="text-right text-warning">
{{ form.paymentType == '1' ? '共计' : 'total' }}:{{
form.paymentType == '1' ? '￥' : '€'
}}{{ Number(totalFee).toFixed(2) }}
......@@ -363,13 +363,13 @@
</div>
</el-col>
<el-col :lg="24">
<div class="text-center" />
<div class="text-center"/>
</el-col>
</el-row>
</div>
</div>
<div v-else class="pd20 skeletonBox">
<el-skeleton :rows="8" />
<el-skeleton :rows="8"/>
<el-button
:style="language == 0 ?'width:200px':'width:400px'" class="btn-lineG" round size="large"
type="primary" @click="showLogin"
......@@ -483,7 +483,7 @@
<div v-if="form.payDate&&form.viewStatus=='1'">
<div class="text-center">
<el-icon color="#32B16C" size="80">
<SuccessFilled />
<SuccessFilled/>
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '€' }}{{ totalFee || 0 }}</h3>
......@@ -505,7 +505,7 @@
</template>
</el-result>
</div>
<Dialog ref="DialogRef" />
<Dialog ref="DialogRef"/>
<el-dialog
v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false"
......@@ -514,7 +514,7 @@
<div class="flex">
<el-form-item :label="language==0?'开票人':'Name'">
<div class="flex">
<el-input v-model="lpName" :placeholder="language==0?'请输入开票人':'Please enter your name'" />
<el-input v-model="lpName" :placeholder="language==0?'请输入开票人':'Please enter your name'"/>
<el-button type="primary" @click="submitSJ">{{ language == 0 ? '提交并下载' : 'Submit' }}</el-button>
</div>
</el-form-item>
......@@ -530,22 +530,22 @@
</template>
<script setup>
import { getCurrentInstance, ref } from 'vue'
import { onMounted } from '@vue/runtime-core'
import { useRoute, useRouter } from 'vue-router'
import {getCurrentInstance, ref} from 'vue'
import {onMounted} from '@vue/runtime-core'
import {useRoute, useRouter} from 'vue-router'
import * as booking from '@/apiPc/booking'
import Dialog from '@/viewsPc/booking/component/dailog.vue'
const { proxy } = getCurrentInstance()
const {proxy} = getCurrentInstance()
const route = useRoute()
const router = useRouter()
const payType = ref('2')
const orderId = ref(route.query.orderId)
const matchId = ref()
import useUserStore from '@/store/modules/user'
import { useStorage } from '@vueuse/core/index'
import { ElMessage, ElMessageBox } from 'element-plus'
import {useStorage} from '@vueuse/core/index'
import {ElMessage, ElMessageBox} from 'element-plus'
import {
cancelOrder,
cancelOrder2,
......@@ -618,7 +618,7 @@ function getData() {
form.value = {
pickUpBo: {}
}
return booking.getCarBilldetailbyId({ orderId: orderId.value }).then(res => {
return booking.getCarBilldetailbyId({orderId: orderId.value}).then(res => {
form.value = res.data
if (language.value == 0) {
totalFee.value = res.data.total
......@@ -631,7 +631,7 @@ function getData() {
})
}
if (type.value == 'food') {
return booking.getFoodBilldetailbyId({ orderId: orderId.value }).then(res => {
return booking.getFoodBilldetailbyId({orderId: orderId.value}).then(res => {
if (language.value == 0) {
totalFee.value = res.data.total
} else {
......@@ -644,7 +644,7 @@ function getData() {
})
}
if (type.value == 'hotel') {
return booking.getRoomBilldetailbyId({ orderId: orderId.value }).then(res => {
return booking.getRoomBilldetailbyId({orderId: orderId.value}).then(res => {
if (language.value == 0) {
totalFee.value = res.data.total
} else {
......@@ -677,7 +677,7 @@ function getData() {
// 旅游订单详情
const getTravelOrderInfo = () => {
return booking.getScenicOrderInfo({ orderId: orderId.value }).then(res => {
return booking.getScenicOrderInfo({orderId: orderId.value}).then(res => {
form.value = res.data
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
matchId.value = form.value.activeId
......@@ -692,7 +692,7 @@ const getTravelOrderInfo = () => {
// 票务订单详情
async function getTicketOrderInfoFN() {
const res = await getTicketOrderInfo({ orderId: orderId.value })
const res = await getTicketOrderInfo({orderId: orderId.value})
form.value = res.data
form.value.extJson = JSON.parse(form.value.extJson)
try {
......@@ -708,7 +708,7 @@ async function getTicketOrderInfoFN() {
}
async function getDetail(activeId) {
const res = await getTicketInfoByActivityId({ activityId: activeId })
const res = await getTicketInfoByActivityId({activityId: activeId})
matchForm.value = res.data
console.log(matchForm.value)
}
......@@ -720,14 +720,14 @@ function goHome() {
function goPay() {
if (payType.value == '2') {
booking.createWePay({ orderId: orderId.value }).then(res => {
booking.createWePay({orderId: orderId.value}).then(res => {
wePayCodeUrl.value = res.data
hideconfirmbtn.value = true
startforGetData()
})
}
if (payType.value == '3') {
booking.createPalPay({ orderId: orderId.value }).then(res => {
booking.createPalPay({orderId: orderId.value}).then(res => {
if (res.data) {
location.href = res.data
}
......@@ -793,7 +793,7 @@ function showLogin() {
function MakeUpOrder() {
return booking.getMealOrderInfo({ orderId: orderId.value }).then(res => {
return booking.getMealOrderInfo({orderId: orderId.value}).then(res => {
form.value = res.data
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
matchId.value = form.value.activeId
......@@ -806,7 +806,7 @@ function MakeUpOrder() {
}
function MakeUpIno() {
booking.getMealOrderInfoByLogex({ asmId: form.value.asmId }).then(res => {
booking.getMealOrderInfoByLogex({asmId: form.value.asmId}).then(res => {
formInfo.value = res.data
console.log(res)
})
......@@ -817,7 +817,7 @@ function MakeUpIno() {
}
function ScenicInfo() {
booking.getLogexScenicVoById({ id: form.value.asId }).then(res => {
booking.getLogexScenicVoById({id: form.value.asId}).then(res => {
formInfo.value = res.data
console.log(res)
}).catch((e) => {
......@@ -828,7 +828,7 @@ function ScenicInfo() {
function photographyOrder() {
return booking.getPhotoOrderInfo({ orderId: orderId.value }).then(res => {
return booking.getPhotoOrderInfo({orderId: orderId.value}).then(res => {
form.value = res.data
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
photographyInfo()
......@@ -839,7 +839,7 @@ function photographyOrder() {
}
function photographyInfo() {
booking.getPhotoOrderInfoByLogex({ aspId: form.value.aspId }).then(res => {
booking.getPhotoOrderInfoByLogex({aspId: form.value.aspId}).then(res => {
formInfo.value = res.data
})
// .catch((e) => {
......
src/viewsPc/booking/ticket/confirmOrder.vue
......@@ -14,36 +14,54 @@
<div class="info">
<div class="name">{{ TickForm2.ticketTypeName }}</div>
<div class="address">{{ TickForm2.stadiumName }}</div>
<div class="address">{{ TickForm2.sessionType=='1000'?'日间场':'夜间场' }}</div>
<div class="address">{{ TickForm2.ticketName }}</div>
<div class="address">
{{ TickForm2.stadiumName }} ｜
<span v-if="TickForm2.sessionType=='1000'">{{ language == 0 ? '日间场' : 'Day' }}</span>
<span v-else>{{ language == 0 ? '夜间场' : 'Night' }}</span>
｜ {{ TickForm2.ticketName }}
</div>
<div v-if="TickForm2.ticketType=='0'" class="address">剩余数量： {{ 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>
</div>
<div class="form">
<el-form ref="formRef" :model="orderForm" :rules="rules" label-width="120px">
<el-form ref="formRef" :model="orderForm" :rules="rules" label-width="140px">
<div v-if="TickForm2.ticketType == '1'">
<el-form-item :label="language == 0 ? '桌号' : 'zuohao'">
<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-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" :label="it.deskNo" :value="it"
:disabled="it.status!=0"/>
</el-radio-group>
</el-form-item>
<el-form-item :label="language == 0 ? '座位号' : 'zuoweihao'">
<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" :label="it.seatNo"
:value="it" :disabled="it.status!=0"/>
</el-checkbox-group>
</el-form-item>
<el-form-item label="已选座位号">
<el-tag v-for="s in currSeat" :key="s.id">{{ s.deskNo }} - {{ s.seatNo }}</el-tag>
<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)">
{{ s.deskNo }} - {{ s.seatNo }}
</el-tag>
</el-form-item>
</div>
<el-form-item
......@@ -98,7 +116,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>
......@@ -109,7 +127,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>
......@@ -123,7 +141,9 @@
</div>
<div class="price_num">
<span>{{ language == 0 ? "¥" : "€" }}</span>
{{ ((language == 0 ?TickForm2.price:TickForm2.priceEn) * orderForm.customerIds.length).toFixed(2) }}
{{
((language == 0 ? TickForm2.price : TickForm2.priceEn) * orderForm.customerIds.length).toFixed(2)
}}
</div>
</div>
</div>
......@@ -137,7 +157,7 @@
</span>
<span class="value">
<span>{{ language == 0 ? "¥" : "€" }}</span>
{{ ((language == 0 ?TickForm2.price:TickForm2.priceEn) * orderForm.customerIds.length).toFixed(2) }}
{{ ((language == 0 ? TickForm2.price : TickForm2.priceEn) * orderForm.customerIds.length).toFixed(2) }}
</span>
</div>
<div class="pay" @click="paymentHandle">
......@@ -150,7 +170,7 @@
</template>
<script setup>
import { ref, computed, onMounted } from 'vue'
import {ref, computed, onMounted} from 'vue'
import {
customerListApi,
submitOrderTicket,
......@@ -160,12 +180,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()
......@@ -211,8 +231,9 @@ const leftCount = ref({})
const deskList = ref([])
const currDesk = ref(null)
const currSeat = ref([])
const tickImg = ref()
onMounted(() => {
tickImg.value = route.query.tickImg
customerList()
getDetail()
......@@ -241,6 +262,10 @@ onMounted(() => {
})
})
function delSeat(item, index) {
currSeat.value.splice(index, 1)
}
function changeGroup(e) {
if (e.length > 0) {
checkPurchasedCustomers({
......@@ -300,7 +325,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) => {
......@@ -369,7 +394,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
}
......@@ -379,6 +404,10 @@ function addPeopl() {
path: '/booking/ticket/peopleManage'
})
}
const showImg = () => {
}
</script>
......@@ -503,7 +532,7 @@ div {
.name {
font-size: 16px;
color: #929aa0;
//color: #929aa0;
margin-bottom: 20px;
.tag_t {
......
src/viewsPc/booking/ticket/index.vue
......@@ -221,8 +221,8 @@
<div class="container bottom">
<div style="display: flex">
<div :class="{'bg':active==1}" class="buBg" @click="active=1">购票说明</div>
<div :class="{'bg' :active==2}" class="buBg" @click="active=2">购票须知</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" />
......@@ -394,6 +394,9 @@ function toSelectSeat() {
params: {
activeId: activeId.value,
latstId: selectForm.value.latstId
},
query: {
tickImg: currTick.value.images
}
})
} else {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!