Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
1735197c by zhangmeng
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	vite.config.js
2 parents 60ee80b7 d9ca28d0
Inline Side-by-side
Showing 5 changed files with 78 additions and 48 deletions
src/viewsPc/booking/component/choosePerson.vue
<template>
<el-dialog v-model="show" title="出行人信息" center append-to-body>
<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-form>
<el-form-item prop="message">
<div class="p_box">
<div class="people">
<el-radio-group v-model="personId">
<div
v-for="(it, index) in personList" :key="index" class="e_item"
>
<div v-for="(it, index) in personList" :key="index" class="e_item">
<el-radio border :value="it.id" :disabled="hasPersonIds?.indexOf(it.id)!=-1">
<div>
{{ it.name }} {{ it.idCard }}
<div class="name">{{ it.name }}</div>
<div class="code">
<span v-if="it.idcType==0">{{ language == 0 ? '身份证' : 'ID number' }}</span>
<span v-if="it.idcType==1">{{ language == 0 ? '护照' : 'Passport' }}</span>
<span v-if="it.idcType==2">{{ language == 0 ? '其他' : 'Other' }}</span>
{{ it.idCard }}
</div>
</el-radio>
</div>
</el-radio-group>
</div>
</div>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="show = false">取 消</el-button>
<el-button type="primary" @click="addPerson">完成</el-button>
<el-button @click="show = false">{{ languageFormat(language, "取 消", "Cancel") }}</el-button>
<el-button type="primary" @click="addPerson">{{ languageFormat(language, "完 成", "Ok") }}</el-button>
</div>
</template>
</el-dialog>
......@@ -36,17 +32,17 @@
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-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-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-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'"/>
</el-form-item>
</el-form>
......@@ -61,15 +57,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)
......@@ -104,11 +100,11 @@ const addPerson = () => {
gateType: currParams.gateType
}).then((res) => {
if (res.data == 201) {
proxy.$modal.msgError('护照只能购买成人票')
proxy.$modal.msgError(language.value == 0 ? '护照只能购买成人票' : 'Passport can only buy adult tickets')
} else if (res.data == 202) {
proxy.$modal.msgError('此身份证不能购买老人票')
proxy.$modal.msgError(language.value == 0 ? '此身份证不能购买老人票' : 'This ID cannot buy senior tickets')
} else if (res.data == 203) {
proxy.$modal.msgError('此身份证不能购买儿童票')
proxy.$modal.msgError(language.value == 0 ? '此身份证不能购买儿童票' : 'This ID cannot buy child tickets')
} else {
show.value = false
emit('addPerson', Object.assign(currParams, {
......@@ -155,5 +151,28 @@ defineExpose({
</script>
<style scoped lang="scss">
.e_item{margin: 20px 20px 0 0;}
.el-radio-group {
display: block;
}
.e_item {
margin: 20px 0 0 0;
width: 100%;
.el-radio {
width: 100%;
height: auto;
padding: 10px;
}
.name {
font-size: 16px;
}
.code {
font-size: 14px;
margin: 4px 0 0;
color: #999;
}
}
</style>
......
src/viewsPc/booking/ticket/confirmOrder.vue
......@@ -21,7 +21,7 @@
｜ {{ TickForm2.ticketName }}
</div>
<div v-if="TickForm2.ticketType=='0'" class="address">剩余数量： {{ leftCount }}</div>
<div v-if="TickForm2.ticketType=='0'" class="address">{{ language==0?'剩余数量':'Remaining Quantity' }}： {{ leftCount }}</div>
</div>
<div class="ticket_info mb20">
......
src/viewsPc/booking/travelOrder.vue
......@@ -58,22 +58,25 @@
<!-- :picker-options="pickerOptions"-->
</el-form-item>
<el-form-item v-for="(n,i) in gateList" :key="i" :label="language==0? n.name:'Rooms'" prop="count">
<el-form-item v-for="(n,i) in gateList" :key="i" :label="language==0? n.name:n.name" prop="count">
<el-input-number v-model="n.count" :min="0" :max="n.leftNum" @change="changeNum(n)" />
<div class="red ml20">
<span v-if="language == 0">单价:{{ n.price }}</span>
<span v-else>{{ n.priceEn }}</span>
<span v-if="language == 0">单价: ¥{{ n.price }}</span>
<span v-else>€ {{ n.priceEn }} / Ticket</span>
</div>
<div class="red ml20">
<span v-if="language == 0">剩余票数:{{ n.leftNum }}</span>
<span v-else>{{ n.leftNum }} Remaining rooms</span>
<span v-else>{{ n.leftNum }} sheet remaining </span>
</div>
</el-form-item>
<div v-if="needPersonNum>0" class="fakeFormItem">
<label>需填写{{ needPersonNum }}位游客</label>
<label v-if="language == 0">需填写{{ needPersonNum }}位游客</label>
<label v-else>Need {{ needPersonNum }} visitors</label>
<div>
<label class="text-warning" v-show="needPersonNum > hasPersonNum">还需填写{{ needPersonNum-hasPersonNum }}位游客</label>
<label class="text-warning" v-show="needPersonNum > hasPersonNum && language==0">
还需填写{{ needPersonNum-hasPersonNum }}位游客
</label>
</div>
</div>
<div v-for="(n,i) in gateList" :key="i">
......@@ -84,9 +87,12 @@
</label>
<div v-if="p.name" class="mation">
<div>{{ p.name }}</div>
身份证：{{ p.idCard }}
<span v-if="p.idcType==0">{{language==0?'身份证':'ID number'}}</span>
<span v-if="p.idcType==1">{{language==0?'护照':'Passport'}}</span>
<span v-if="p.idcType==2">{{language==0?'其他':'Other'}}</span>
：{{ p.idCard }}
</div>
<el-icon @click="showAddPerson(n, j,p)"><Edit /></el-icon>
<el-icon @click="showAddPerson(n, j,p)" color="#453DEA"><Edit /></el-icon>
</div>
</div>
......@@ -107,13 +113,13 @@
<div v-for="(c, index) in gateList" v-show="c.count>0" :key="index" class="ccitem">
{{ c.name }}
<span v-if="language==0">{{ c.count }}*{{ '¥' }}{{ c.price }}</span>
<span v-else>{{ c.count }}*{{ '€' }}{{ c.priceEn }}</span>
<span v-if="language==0">{{ c.count }} * {{ '¥' }}{{ c.price }}</span>
<span v-else>{{ c.count }} * {{ '€' }} {{ c.priceEn }}</span>
</div>
<label>{{ language == 0 ? '共计' : 'Total' }}<span
class="fr bigMoney"
>{{ language == 0 ? '¥' : '€' }}{{ money }}</span></label>
>{{ language == 0 ? '¥' : '€' }} {{ money }}</span></label>
</div>
</el-col>
......@@ -457,7 +463,7 @@ function submit() {
line-height: 32px;flex: 0 0 auto;
display: inline-flex;
justify-content: flex-end;
align-items: center;gap: 10px;}
align-items: center;gap: 10px;white-space: nowrap;}
}
.tip{font-size: 14px;color: #666;padding: 0 10px;}
.personIt{display: flex;align-items: center;
......
src/viewsPc/center/myReservation.vue
......@@ -93,7 +93,7 @@
</div>
<div v-if="b.orderType == 6">
<h3 class="name">{{ b.name }}</h3>
<p>出行时间：{{ b.extJsonObj.dcStart }}</p>
<p>{{ language==0?'出行时间':'Travel Time' }}：{{ b.extJsonObj.dcStart }}</p>
<p v-for="t in b.extJsonObj.touristList">{{ t.gateName }}：{{ t.name }}</p>
</div>
</el-col>
......
src/viewsPc/components/homeQuick.vue
......@@ -36,9 +36,14 @@
<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">
<div class="item_en" @click="popRemark(3)"><img src="@/assets/dance/btn03.png">
<p>DINING RESERVATION</p>
<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">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!