eab837e9 by 杨炀

- [x] 3、首页倒计时不显示 直播倒计时

- [x] 4、首页快捷入口场地介绍改成票务服务(替换图标和名称)
- [x] 5、浏览器中的logo替换
- [x] 9、币种:美金(关联支付,显示等)--支付待测试
- [x] 6、快捷入口继续保留5个,周边活动换没到右边和在线客服一起
- [x] 13、英文版通知无法点开
- [x] 8、注册页面,姓和名分两行显示
- [x] 1、导航栏(按照效果图实施)
1 parent 44d44cc3
Showing 50 changed files with 197 additions and 169 deletions
No preview for this file type
......@@ -178,7 +178,7 @@ li.el-select-dropdown__item {
.el-menu--horizontal {
height: 35px;
border-bottom: none;
justify-content: space-between;
justify-content: start;
}
.el-menu--horizontal > .el-menu-item {
......
......@@ -56,6 +56,12 @@
</div>
<div class="fixed-right forPc">
<div class="mlb" v-if="language===0">
<div @click="goAround" class="mb10 pb5">
<a>
<img class="kf" src="@/assets/logo/btn02.png"/>
<div class="text-center mt10">周边活动</div>
</a>
</div>
<div onclick="window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=6c500b60-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=ZHCN','_blank','height=700px,width=700px,top=50,left=0,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')" title="客服" >
<img class="kf" src="@/assets/logo/btn01.png"/>
<div class="text-center mt10">在线客服</div>
......@@ -63,11 +69,17 @@
<!-- <div @click="goHelpZH">-->
<!-- <a>-->
<!-- <img class="kf" src="@/assets/logo/btn02.png"/>-->
<!-- <div class="text-center mt10">参赛指南</div>-->
<!-- <div class="text-center mt10">周边活动</div>-->
<!-- </a>-->
<!-- </div>-->
</div>
<div class="mlb" v-else>
<div @click="goAround" class="mb10 pb5">
<a>
<img class="kf" src="@/assets/logo/btn02.png"/>
<div class="text-center mt10">周边活动</div>
</a>
</div>
<div onclick="window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=707daf80-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=EN','_blank','height=700px,width=700px,top=100,left=150,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')" title="Live Chat">
<img class="kf" src="@/assets/logo/btn01.png"/>
<div class="text-center ">LIVE CHAT</div>
......@@ -103,6 +115,10 @@ const goHelpZH = () => {
}
})
}
const goAround = () => {
//周边活动
router.push({path: `/about/wuDao`,query: {activeIndex: '2'}})
}
</script>
<style lang="scss" scoped>
......
......@@ -176,19 +176,21 @@ onMounted(() => {
if (user) {
isLogin.value = true
}
if (route.fullPath.indexOf('news') > -1) {
})
watch(() => route.fullPath, (val) => {
if (val.indexOf('news') > -1) {
activeIndex.value = '/news'
} else if (route.fullPath.indexOf('notice') > -1) {
} else if (val.indexOf('notice') > -1) {
activeIndex.value = '/notice'
} else if (route.fullPath.indexOf('about') > -1) {
} else if (val.indexOf('about') > -1) {
activeIndex.value = '/about'
} else if (route.fullPath.indexOf('meta') > -1) {
} else if (val.indexOf('meta') > -1) {
activeIndex.value = '/meta'
} else if (route.fullPath.indexOf('guide') > -1) {
} else if (val.indexOf('guide') > -1) {
activeIndex.value = '/guide'
} else if (route.fullPath.indexOf('saiC') > -1) {
} else if (val.indexOf('saiC') > -1) {
activeIndex.value = '/saiC'
} else if (route.fullPath.indexOf('match') > -1) {
} else if (val.indexOf('match') > -1) {
activeIndex.value = '/match/list'
}
console.log(activeIndex.value)
......
......@@ -57,11 +57,7 @@
<el-menu-item index="/saiC">赛程安排</el-menu-item>
<el-menu-item index="/meta">媒体中心</el-menu-item>
<!-- <el-menu-item index="/guide">参赛指南</el-menu-item>-->
<el-sub-menu index="/about">
<template #title>关于我们</template>
<el-menu-item index="/about/wuDao">舞蹈节</el-menu-item>
<el-menu-item index="/about/culture">地方文化</el-menu-item>
</el-sub-menu>
<el-menu-item index="/about/wuDao">关于我们</el-menu-item>
</el-menu>
<el-menu class="weiMenu"
v-if="language==1"
......
......@@ -70,7 +70,6 @@ const menu = ref([
{name:'组织机构',ename:'Organizer'},
{name:'2025WTC世锦赛',ename:'2025WTC World Tournament'},
{name:'周边活动',ename:'Around Activity'},
// {name:'体育舞蹈项目',ename:''},
])
const contact = ref([
......
......@@ -26,20 +26,20 @@
<div v-if="!b.orderType&&orderType==5">
<p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}{{b.groupName}}</p>
<p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}{{b.payTime}}</p>
<p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':''}} {{b.totalPayAmount}}</p>
<p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':'$'}} {{b.totalPayAmount}}</p>
</div>
<!-- 酒店订单-->
<div v-if="b.orderType == 0">
<p>{{b.messageObj.roomInfo}}</p>
<p>{{b.messageObj.roomStayDate}}</p>
<p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 接送订单-->
<div v-if="b.orderType == 1">
<p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
<span>{{car.name}}{{car.num}}</span>
</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 餐饮订单-->
<div v-if="b.orderType == 2">
......@@ -48,7 +48,7 @@
{{n.name}}({{n.categoryName}}) <span>{{n.num}}</span>
</span>
</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'' :'¥' }}{{b.total}}</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'$' :'¥' }}{{b.total}}</p>
</div>
<div v-if="b.orderType == 3 || b.orderType == 4">
<div>
......@@ -57,7 +57,7 @@
<div>
{{language==0?'预约时间:':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
</div>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
</div>
......@@ -66,9 +66,9 @@
<h3>{{ formDate.name }}</h3>
<div>
<p>地点:{{formDate.placeName}}</p>
<p>单价:{{paymentType!=2?'¥':''}}{{formDate.singlePrice}}</p>
<p>单价:{{paymentType!=2?'¥':'$'}}{{formDate.singlePrice}}</p>
<p>数量:{{formDate.seatList?.length}}</p>
<p class="poPrice">{{paymentType!=2?'¥':''}}{{formDate.payAmount}}</p>
<p class="poPrice">{{paymentType!=2?'¥':'$'}}{{formDate.payAmount}}</p>
</div>
</div>
......@@ -76,8 +76,8 @@
<div class="border-rr mt20 pd20">
<el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
<el-form-item :label="language == 0 ?'开票金额':'Amount'">
<span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':''}}{{totalMoney}}</span>
<span v-else class="bigprice">{{paymentType!=3?'¥':''}}{{totalMoney}}</span>
<span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'$'}}{{totalMoney}}</span>
<span v-else class="bigprice">{{paymentType!=3?'¥':'$'}}{{totalMoney}}</span>
</el-form-item>
<el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm">
......
......@@ -68,7 +68,7 @@
</div>
<div v-else class="price">
$
<span
v-if="r.outPriceEn&&r.inPriceEn">{{ (Number(r.inPriceEn) || 0) > Number(r.outPriceEn) ? r.outPriceEn : r.inPriceEn }}</span>
<span v-else-if="r.inPriceEn>0">{{ r.inPriceEn }}</span>
......
......@@ -126,23 +126,23 @@
<div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div>
<div class="border-rr mt20 pd20 ccitemBox">
<label v-show="form.useType.indexOf('0')>-1"> {{ language == 0 ? '接站车辆费' : 'Room fee' }}
<span class="fr">{{ language == 0 ? '¥' : '' }}{{ form.pickUpBo.total }}</span>
<span class="fr">{{ language == 0 ? '¥' : '$' }}{{ form.pickUpBo.total }}</span>
</label>
<div v-show="form.useType.indexOf('0')>-1" class="ccitem">
{{ car.name }}
<span>{{ form.num }} *{{ language == 0 ? '¥' : '' }}{{ car.inPrice }}</span>
<span>{{ form.num }} *{{ language == 0 ? '¥' : '$' }}{{ car.inPrice }}</span>
</div>
<label v-show="form.useType.indexOf('1')>-1">{{ language == 0 ? '送站车辆费' : 'Extra bed fee' }}
<span class="fr">{{ language == 0 ? '¥' : '' }}{{ form.dropOffBo.total }}</span>
<span class="fr">{{ language == 0 ? '¥' : '$' }}{{ form.dropOffBo.total }}</span>
</label>
<div v-show="form.useType.indexOf('1')>-1" class="ccitem">
{{ car.name }}
<span>{{ form.num }}*{{ language == 0 ? '¥' : '' }}{{ car.outPrice }}</span>
<span>{{ form.num }}*{{ language == 0 ? '¥' : '$' }}{{ car.outPrice }}</span>
</div>
<label>{{ language == 0 ? '共计' : 'Total' }}<span
class="fr bigMoney">{{ language == 0 ? '¥' : '' }}{{ money }}</span></label>
class="fr bigMoney">{{ language == 0 ? '¥' : '$' }}{{ money }}</span></label>
</div>
</el-col>
......@@ -153,7 +153,7 @@
<el-row align="middle" justify="space-between">
<el-col :lg="12">
<label>{{ language == 0 ? '共计金额' : 'Total' }}
<span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{
<span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{
money
}}</span></span>
</label>
......
......@@ -80,7 +80,7 @@
</el-col>
<el-col :lg="4" :sm="12" :xs="12" class="zh-margin">
<span style="font-size: 24px">{{ language==0?'¥':''}} </span>
<span style="font-size: 24px">{{ language==0?'¥':'$'}} </span>
{{language==0?n.mealPrice:n.mealPriceEn}}
</el-col>
<el-col :lg="6" :sm="12" :xs="12" class="forPc">
......
......@@ -73,7 +73,7 @@
</el-col>
</el-row>
<el-row>
<div class="zh-margin" style="font-size: 36px;color: #ff8124"><span style="font-size: 24px">{{ language==0?'¥':''}} </span> {{language==0?n.photoPrice:n.photoPriceEn}}</div>
<div class="zh-margin" style="font-size: 36px;color: #ff8124"><span style="font-size: 24px">{{ language==0?'¥':'$'}} </span> {{language==0?n.photoPrice:n.photoPriceEn}}</div>
<el-button :disabled="n.num-n.counts<=0||Date.now()>dayjs(currentDate).subtract(-1,'day').valueOf()" class="btn-lineG w200px" round type="primary" size="large" @click="goMatch(n)">{{ language==0?'立即预约':'Select' }} ⇀</el-button>
</el-row>
</el-row>
......
......@@ -27,7 +27,7 @@
{{h.addName}}
</p>
<div class="price mb10" v-if="language==0"><i class="text-warning">¥</i><span class="text-warning">{{ h.price || 0 }}</span></div>
<div class="price mb10" v-else><i class="text-warning"></i><span class="text-warning">{{ h.price || 0 }}</span>start</div>
<div class="price mb10" v-else><i class="text-warning">$</i><span class="text-warning">{{ h.price || 0 }}</span>start</div>
<el-button class="btn-lineG" round type="primary" size="large" @click="goDetail(h)">{{ language==0?'立即预约':'Select' }}</el-button>
</el-col>
......
......@@ -55,7 +55,7 @@
</el-col>
<el-col :span="3">
<div class="price">{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}<span>{{ language == 0 ? r.foodPrice : r.foodPriceEn }}</span></div>
</el-col>
<el-col :span="3">
......
......@@ -65,11 +65,11 @@
<label> {{food.name }}</label>
<div class="ccitem" v-for="(c, index) in choseDays" :key="index">
{{ c }}
<span>{{ form.num }}*{{ language == 0 ? '¥' : '' }}{{ language == 0 ?food.foodPrice:food.foodPriceEn }}</span>
<span>{{ form.num }}*{{ language == 0 ? '¥' : '$' }}{{ language == 0 ?food.foodPrice:food.foodPriceEn }}</span>
</div>
<label>{{ language == 0 ? '共计' : 'Total' }}<span
class="fr bigMoney">{{ language == 0 ? '¥' : '' }}{{ form.total }}</span></label>
class="fr bigMoney">{{ language == 0 ? '¥' : '$' }}{{ form.total }}</span></label>
</div>
</el-col>
......@@ -80,7 +80,7 @@
<el-row justify="space-between" align="middle">
<el-col :lg="12">
<label>{{ language == 0 ? '共计金额' : 'Total' }}
<span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ form.total }}</span></span>
<span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{ form.total }}</span></span>
</label>
</el-col>
<el-col :lg="12" class="text-right">
......
......@@ -39,7 +39,7 @@
</p>
</el-col>
<el-col :lg="4" :md="4" class="text-right">
<div class="price">{{ language==0?'¥':'' }}<span>{{ h.price }}</span>
<div class="price">{{ language==0?'¥':'$' }}<span>{{ h.price }}</span>
<i v-if="language==0"></i>
</div>
<el-button class="w200px blackBtn" round type="primary" >{{ language==0?'立即预订':'Select' }}</el-button>
......
......@@ -145,7 +145,7 @@
</el-col>
<el-col :lg="3" :md="12" :sm="12" :xs="12">
<div class="price">{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}<span>{{ language == 0 ? r.roomPrice : r.roomPriceEn }}</span></div>
</el-col>
<el-col :lg="3" :md="12" :sm="12" :xs="12">
......
......@@ -93,34 +93,34 @@
<div class="border-rr mt20 pd20 ccitemBox">
<label> {{ language == 0 ? '房费' : 'Room fee' }}
<span class="fr" v-if="language==0">{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}{{ (room.roomPrice * form.roomNum * choseRooms.length).toFixed(2) }}</span>
<span class="fr" v-else>{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}{{ (room.roomPriceEn * form.roomNum * choseRooms.length).toFixed(2) }}</span>
</label>
<div class="ccitem" v-for="(c, index) in choseRooms" :key="index" v-show="form.roomNum>0">
{{ c }}
<span v-if="language==0">{{ form.roomNum }}*{{ language == 0 ? '¥' : '' }}{{ room.roomPrice }}</span>
<span v-else>{{ form.roomNum }}*{{ language == 0 ? '¥' : '' }}{{ room.roomPriceEn }}</span>
<span v-if="language==0">{{ form.roomNum }}*{{ language == 0 ? '¥' : '$' }}{{ room.roomPrice }}</span>
<span v-else>{{ form.roomNum }}*{{ language == 0 ? '¥' : '$' }}{{ room.roomPriceEn }}</span>
</div>
<label v-if="form.isAddbed=='1'&&form.addNum>0">{{ language == 0 ? '加床费' : 'Extra bed fee' }}
<span class="fr" v-if="language==0">{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}{{ (room.bedPrice * form.addNum * choseRooms.length).toFixed(2) }}</span>
<span class="fr" v-else>{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}{{ (room.bedPriceEn * form.addNum * choseRooms.length).toFixed(2) }}</span>
</label>
<div v-if="form.isAddbed=='1'&&form.addNum>0" class="ccitem" v-for="(c, index) in choseRooms" :key="index">
{{ c }}
<span>{{ form.addNum }}*{{ language == 0 ? '¥' : '' }}{{ language == 0 ?room.bedPrice:room.bedPriceEn}}</span>
<span>{{ form.addNum }}*{{ language == 0 ? '¥' : '$' }}{{ language == 0 ?room.bedPrice:room.bedPriceEn}}</span>
</div>
<label>{{ language == 0 ? '共计' : 'Total' }}<span
class="fr bigMoney">{{ language == 0 ? '¥' : '' }}{{ money }}</span></label>
class="fr bigMoney">{{ language == 0 ? '¥' : '$' }}{{ money }}</span></label>
</div>
</el-col>
......@@ -131,7 +131,7 @@
<el-row justify="space-between" align="middle">
<el-col :span="12">
<label>{{ language == 0 ? '共计金额' : 'Total' }}
<span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ money }}</span></span>
<span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{ money }}</span></span>
</label>
</el-col>
<el-col :span="12" class="text-right">
......
......@@ -24,20 +24,20 @@
<div v-if="!b.orderType&&orderType==5">
<p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}{{b.groupName}}</p>
<p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}{{b.payTime}}</p>
<p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':''}} {{b.totalPayAmount}}</p>
<p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':'$'}} {{b.totalPayAmount}}</p>
</div>
<!-- 酒店订单-->
<div v-if="b.orderType == 0">
<p>{{b.messageObj.roomInfo}}</p>
<p>{{b.messageObj.roomStayDate}}</p>
<p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 接送订单-->
<div v-if="b.orderType == 1">
<p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
<span>{{car.name}}{{car.num}}</span>
</p>
<p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 餐饮订单-->
<div v-if="b.orderType == 2">
......@@ -46,7 +46,7 @@
{{n.name}}({{n.categoryName}}) <span>{{n.num}}</span>
</span>
</p>
<p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
<div v-if="b.orderType == 3 || b.orderType == 4">
<div>
......@@ -55,7 +55,7 @@
<div>
{{language==0?'预约时间:':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
</div>
<p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p>
<p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
</div>
</div>
<div class="border-info" v-if="orderType==6">
......@@ -63,17 +63,17 @@
<h3>{{ formDate.name }}</h3>
<div>
<p>地点:{{formDate.placeName}}</p>
<p>单价:{{paymentType!=2?'¥':''}}{{formDate.singlePrice}}</p>
<p>单价:{{paymentType!=2?'¥':'$'}}{{formDate.singlePrice}}</p>
<p>数量:{{formDate.seatList?.length}}</p>
<p class="poPrice">{{paymentType!=2?'¥':''}}{{formDate.payAmount}}</p>
<p class="poPrice">{{paymentType!=2?'¥':'$'}}{{formDate.payAmount}}</p>
</div>
</div>
<div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div>
<div class="border-rr mt20 pd20">
<el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
<el-form-item :label="'开票金额'">
<span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':''}}{{totalMoney}}</span>
<span v-else class="bigprice">{{paymentType!=3?'¥':''}}{{totalMoney}}</span>
<span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'$'}}{{totalMoney}}</span>
<span v-else class="bigprice">{{paymentType!=3?'¥':'$'}}{{totalMoney}}</span>
</el-form-item>
<el-form-item :label="`发票形式`" required prop="invoiceForm">
......
......@@ -48,12 +48,12 @@
<!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>-->
<div v-if="language==0" style="margin-bottom: 20px">地点 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="span">{{ formDatas.address}}</span></div>
<div v-else style="margin-bottom: 20px">Address &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.addressEn}}</span></div>
<div >{{ language==0?' 价格':"Price" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:''+formDatas.mealPriceEn }}</span></div>
<div >{{ language==0?' 价格':"Price" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:'$'+formDatas.mealPriceEn }}</span></div>
</div>
<div style="flex: 1">
<div @click="hazelView(formDatas)" style="margin-bottom: 20px" :class="{esp_3:active}" class="s">{{ language==0?'套餐说明':"Package description" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div>
<!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:''+formDatas.mealPriceEn }}</span></div>-->
<!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.mealPrice:'$'+formDatas.mealPriceEn }}</span></div>-->
</div>
</el-row>
</el-row>
......@@ -95,7 +95,7 @@
<el-row justify="space-between" align="middle">
<el-col :span="12">
<label>{{ language == 0 ? '共计金额' : 'Total' }}
<span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{
<span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{
money
}}</span></span>
</label>
......
......@@ -68,7 +68,7 @@
<el-col>
{{ language == 0 ? '套餐' : 'Package' }}{{ formInfo.mealName }} <span
style="margin-left: 40px">{{ language == 0 ? '价格' : 'Price' }}</span><span
class="price">{{ language == 0 ? '¥' + formInfo.mealPrice : '' + formInfo.mealPriceEn }}</span>
class="price">{{ language == 0 ? '¥' + formInfo.mealPrice : '$' + formInfo.mealPriceEn }}</span>
<span style="margin-left: 40px">{{
language == 0 ? '工作室电话' : 'Studio phone number'
}}{{ formInfo.contact }}</span>
......@@ -102,7 +102,7 @@
<el-col>
{{ language == 0 ? '套餐' : 'Package' }}{{ formInfo.photoName }} <span
style="margin-left: 40px">{{ language == 0 ? '价格' : 'Price' }}</span><span
class="price">{{ language == 0 ? '¥' + formInfo.photoPrice : '' + formInfo.photoPriceEn }}</span>
class="price">{{ language == 0 ? '¥' + formInfo.photoPrice : '$' + formInfo.photoPriceEn }}</span>
</el-col>
<el-col>
{{ language == 0 ? '套餐说明' : 'Package Description' }}{{ formInfo.introduction }}
......@@ -187,7 +187,7 @@
<span v-if="car.num > 0"> {{ car.num }}{{
language == 0 ? '辆' : 'Cars'
}} * {{ language == 0 ? '¥' : '' }}{{ car.price }}</span>
}} * {{ language == 0 ? '¥' : '$' }}{{ car.price }}</span>
</div>
<div>{{ language == 0 ? '人数' : 'People' }} {{ form.pickUpBo.count }}</div>
......@@ -214,7 +214,7 @@
<span v-if="car.num > 0"> {{ car.num }}{{
language == 0 ? '辆' : 'Cars'
}} * {{ language == 0 ? '¥' : '' }}{{ car.price }}</span>
}} * {{ language == 0 ? '¥' : '$' }}{{ car.price }}</span>
</div>
<div>{{ language == 0 ? '人数' : 'Counts' }}{{ form.dropOffBo.count }}</div>
<div>{{ language == 0 ? '联系人' : 'Contact Person' }}{{ form.dropOffBo.contacts }}</div>
......@@ -312,14 +312,14 @@
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div v-if="language == 0 ">
{{ language == 0 ? '¥' : '' }}
{{ language == 0 ? '¥' : '$' }}
{{
!v.discount ? form.extJson?.ticketDate?.price : form.extJson?.ticketDate?.rebatePrice
}}
/{{ language == 0 ? '张' : 'Tickets' }}
</div>
<div v-else>
{{ language == 0 ? '¥' : '' }}
{{ language == 0 ? '¥' : '$' }}
{{
!v.discount ? form.extJson?.ticketDate?.priceEn : form.extJson?.ticketDate?.rebatePriceEn
}}
......@@ -340,7 +340,7 @@
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
{{ language == 0 ? '共计' : 'total' }}:{{
language == 0 ? '¥' : ''
language == 0 ? '¥' : '$'
}}{{ Number(totalFee).toFixed(2) }}
</el-col>
</el-row>
......@@ -361,20 +361,20 @@
</el-col>
<el-col :lg="12" class="result">
<div v-if="form.viewStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div v-if="form.viewStatus=='1'||form.viewStatus=='5'" class="priceb">
{{ language == 0 ? '已支付金额' : 'Amount Due' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div v-if="form.viewStatus=='4'" class="priceb">{{ language == 0 ? '已退订' : 'Refunded' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div v-if="form.viewStatus=='2'" class="priceb">{{ language == 0 ? '已取消' : 'Canceled' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div v-if="form.viewStatus=='7'" class="priceb">{{ language == 0 ? '退款审核中' : 'Refund in review' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
</el-col>
<el-col :lg="24">
......@@ -534,7 +534,7 @@
<SuccessFilled/>
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ totalFee || 0 }}</h3>
<h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ totalFee || 0 }}</h3>
</div>
</div>
</el-card>
......
......@@ -62,7 +62,7 @@
<span >{{ formInfo.remarks }} </span>
</el-col>
<el-col>
{{ language == 0 ?'套餐':'Package' }}{{ formInfo.mealName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.mealPrice:''+ formInfo.mealPriceEn}}</span>
{{ language == 0 ?'套餐':'Package' }}{{ formInfo.mealName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.mealPrice:'$'+ formInfo.mealPriceEn}}</span>
</el-col>
<el-col>
{{ language == 0 ?'套餐说明':'Package Description' }}{{ formInfo.introduction}}
......@@ -80,7 +80,7 @@
<span >{{ formInfo.remarks }} </span>
</el-col>
<el-col>
{{ language == 0 ?'套餐':'Package' }}{{ formInfo.photoName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.photoPrice:''+ formInfo.photoPriceEn}}</span>
{{ language == 0 ?'套餐':'Package' }}{{ formInfo.photoName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.photoPrice:'$'+ formInfo.photoPriceEn}}</span>
</el-col>
<el-col>
{{ language == 0 ?'套餐说明':'Package Description' }}{{ formInfo.introduction}}
......@@ -111,7 +111,7 @@
<el-tag>{{car.carColor}}</el-tag>
</div>
<span v-if="car.num > 0"> {{car.num}}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ?'¥':'' }}{{car.price}}</span>
<span v-if="car.num > 0"> {{car.num}}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ?'¥':'$' }}{{car.price}}</span>
</div>
<div>{{ language == 0 ?'人数':'People' }}{{form.pickUpBo.count}}</div>
......@@ -134,7 +134,7 @@
<el-tag>{{car.carColor}}</el-tag>
</div>
<span v-if="car.num > 0"> {{car.num }}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ? '¥' : '' }}{{car.price}}</span>
<span v-if="car.num > 0"> {{car.num }}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ? '¥' : '$' }}{{car.price}}</span>
</div>
<div>{{ language == 0 ?'人数':'Counts' }}{{ form.dropOffBo.count }}</div>
<div>{{ language == 0 ?'联系人':'Contact Person' }}{{ form.dropOffBo.contacts }}</div>
......@@ -204,19 +204,19 @@
</el-col>
<el-col :lg="12" class="result">
<div class="priceb" v-if="form.viewStatus=='0'">{{ language == 0 ? '待支付金额' : 'Amount Due' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div class="priceb" v-if="form.viewStatus=='1'||form.viewStatus=='5'">{{ language == 0 ? '已支付金额' : 'Amount Due' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div class="priceb" v-if="form.viewStatus=='4'">{{ language == 0 ? '已退订' : 'Refunded' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div class="priceb" v-if="form.viewStatus=='2'">{{ language == 0 ? '已取消' : 'Canceled' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
<div class="priceb" v-if="form.viewStatus=='7'">{{ language == 0 ? '退款审核中' : 'Refund in review' }}
<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
</div>
</el-col>
</el-row>
......@@ -319,7 +319,7 @@
<SuccessFilled/>
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ totalFee || 0 }}</h3>
<h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ totalFee || 0 }}</h3>
</div>
</div>
</el-card>
......
......@@ -47,12 +47,12 @@
<!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>-->
<div v-if="language==0" style="margin-bottom: 20px;">上门摄影 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div>
<div v-else style="margin-bottom: 20px;">Door-to-door photography &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'YES':'NO' }}</span></div>
<div >{{ language==0?'价格':"Price" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:''+formDatas.photoPriceEn }}</span></div>
<div >{{ language==0?'价格':"Price" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:'$'+formDatas.photoPriceEn }}</span></div>
</div>
<div style="flex: 1">
<div style="margin-bottom: 20px">{{ language==0?'套餐说明':"Package description" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div>
<!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:''+formDatas.photoPriceEn }}</span></div>-->
<!-- <div >价格&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="sign">{{language==0? '¥'+formDatas.photoPrice:'$'+formDatas.photoPriceEn }}</span></div>-->
</div>
</el-row>
</el-row>
......@@ -94,7 +94,7 @@
<el-row justify="space-between" align="middle">
<el-col :span="12">
<label>{{ language == 0 ? '共计金额' : 'Total' }}
<span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{
<span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{
money
}}</span></span>
</label>
......
......@@ -25,21 +25,21 @@
<p>票档:{{ ticketForm.extJson?.ticketType?.name }}</p>
<p>时间:{{ ticketForm.extJson?.ticketDate.name }}</p>
<p>通票:{{
paymentType != 3 ? '¥' : ''
paymentType != 3 ? '¥' : '$'
}}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
}}
/1张</p>
<p>优惠票:{{
paymentType != 3 ? '¥' : ''
paymentType != 3 ? '¥' : '$'
}}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
/1张</p>
<p class="poPrice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</p>
<p class="poPrice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</p>
</div>
<div>
<el-row v-for="v in message" style="width: 100%">
......@@ -55,7 +55,7 @@
{{
!v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
{{ paymentType != 3 ? '¥' : '' }}/张
{{ paymentType != 3 ? '¥' : '$' }}/张
</el-col>
</el-row>
<el-row style="width: 100%">
......@@ -67,7 +67,7 @@
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
共计:{{ (totalMoney * 1).toFixed(2) }}{{
paymentType != 3 ? '¥' : ''
paymentType != 3 ? '¥' : '$'
}}
</el-col>
</el-row>
......@@ -81,7 +81,7 @@
<el-form ref="formRef" :label-width="paymentType != 3 ?'100':'150'" :model="form" :rules="rules"
class="mw500">
<el-form-item :label="language==0 ?'开票金额':'Amount'">
<span class="bigprice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</span>
<span class="bigprice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</span>
</el-form-item>
<el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
......
......@@ -125,13 +125,13 @@
{{ languageFormat(language, "共计", "Total") }}
</div>
<div class="price_num">
<span>{{ language == 0 ? "¥" : "" }}</span>
<span>{{ language == 0 ? "¥" : "$" }}</span>
{{
language == 0 ? (price.total_cn * 1).toFixed(2) : (price.total_en * 1).toFixed(2)
}}
<span v-if="tickType.isCountSale==1&&orderForm.message.length>=tickType.counts" class="total">
{{ language == 0 ? "¥" : "" }}
{{ language == 0 ? "¥" : "$" }}
{{
language == 0 ? (price.total_cnY * 1).toFixed(2) : (price.total_enY * 1).toFixed(2)
}}
......@@ -148,7 +148,7 @@
{{ languageFormat(language, "共计金额", "Subtotal") }}
</span>
<span class="value">
<span>{{ language == 0 ? "¥" : "" }}</span>
<span>{{ language == 0 ? "¥" : "$" }}</span>
{{ language == 0 ? (price.total_cn * 1).toFixed(2) : (price.total_en * 1).toFixed(2) }}
</span>
</div>
......
......@@ -123,7 +123,7 @@
<div class="select_item_box">
<div class="select_item">
<div class="tagActive" style="min-width: 80px">
{{ language == 0 ? '¥' : '' }} {{ language == 0 ? selectForm.price : selectForm.priceEn }}
{{ language == 0 ? '¥' : '$' }} {{ language == 0 ? selectForm.price : selectForm.priceEn }}
</div>
</div>
</div>
......
......@@ -24,17 +24,17 @@
<p>地址:{{ matchForm.address }}</p>
<p>票档:{{ ticketForm.extJson?.ticketType?.name }}</p>
<p>时间:{{ ticketForm.extJson?.ticketDate.name }}</p>
<p>通票:{{ paymentType != 3 ? '¥' : '' }}
<p>通票:{{ paymentType != 3 ? '¥' : '$' }}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
}}
/1张</p>
<p>优惠票:{{ paymentType != 3 ? '¥' : '' }}
<p>优惠票:{{ paymentType != 3 ? '¥' : '$' }}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
/1张</p>
<p class="poPrice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</p>
<p class="poPrice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</p>
</div>
<div>
<el-row v-for="v in message" style="width: 100%">
......@@ -50,7 +50,7 @@
{{
!v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
{{ paymentType != 3 ? '¥' : '' }}/张
{{ paymentType != 3 ? '¥' : '$' }}/张
</el-col>
</el-row>
<el-row style="width: 100%">
......@@ -66,7 +66,7 @@
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
共计:{{ (totalMoney * 1).toFixed(2) }}{{
paymentType != 3 ? '¥' : ''
paymentType != 3 ? '¥' : '$'
}}
</el-col>
</el-row>
......@@ -77,7 +77,7 @@
<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>
<span class="bigprice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</span>
</el-form-item>
<el-form-item :label="`发票形式`" prop="invoiceForm" required>
......
......@@ -23,9 +23,9 @@
<div class="customer">
<div class="name">{{ n.name }}
<span class="fr fwb text-warning" v-if="language==0&&n.discount == 0"> ¥{{n.price}} </span>
<span class="fr fwb text-warning" v-if="language==1&&n.discount == 0"> {{n.priceEn}} </span>
<span class="fr fwb text-warning" v-if="language==1&&n.discount == 0"> ${{n.priceEn}} </span>
<span class="fr fwb text-warning" v-if="language==0&&n.discount == 1"> ¥{{n.rebatePrice}} </span>
<span class="fr fwb text-warning" v-if="language==1&&n.discount == 1"> {{n.rebatePriceEn}} </span>
<span class="fr fwb text-warning" v-if="language==1&&n.discount == 1"> ${{n.rebatePriceEn}} </span>
</div>
<p>
<label v-if="n.idcType == 0">{{ language==0?'身份证':'ID Card' }}</label>
......
......@@ -51,7 +51,7 @@
</p>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
<span class="text-warning"> {{ b.paymentType == '3' ? '' : '¥' }}
<span class="text-warning"> {{ b.paymentType == '3' ? '$' : '¥' }}
<span class="bigMoney">{{ b.totalStr }}</span>
</span>
</el-col>
......@@ -87,7 +87,7 @@
</div>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
<span class="text-warning"> {{ b.payType != '2' || !b.totalPayAmount ? '¥' : '' }}
<span class="text-warning"> {{ b.payType != '2' || !b.totalPayAmount ? '¥' : '$' }}
<span class="bigMoney">{{ b.totalPayAmount || b.totalAmount }}</span>
</span>
</el-col>
......@@ -162,7 +162,7 @@
</div>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
<span class="text-warning"> {{ b.paymentType == 3 ? '' : '¥' }}
<span class="text-warning"> {{ b.paymentType == 3 ? '$' : '¥' }}
<span class="bigMoney">{{ b.totalStr }}</span>
</span>
</el-col>
......
......@@ -109,7 +109,7 @@
</div>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
<span class="text-warning"> {{ language == 0 ? '¥' : '' }}
<span class="text-warning"> {{ language == 0 ? '¥' : '$' }}
<span class="bigMoney">{{ language == 0 ? b.total : b.totalEn }}</span>
</span>
</el-col>
......
......@@ -11,14 +11,14 @@
<div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">接送服务</div>
</el-col>
<el-col :sm="12" :lg="4" :xs="12">
<div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">场地介绍</div>
<div class="item" @click="popRemark(10)"><img src="@/assets/dance/btn04.png">票务服务</div>
</el-col>
<el-col :sm="12" :lg="4" :xs="12">
<div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">媒体注册</div>
</el-col>
<el-col :sm="12" :lg="4" :xs="12">
<div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">周边活动</div>
</el-col>
<!-- <el-col :sm="12" :lg="4" :xs="12">-->
<!-- <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">周边活动</div>-->
<!-- </el-col>-->
<!-- <el-col :sm="12" :lg="4" :xs="12">-->
<!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>-->
<!-- </el-col>-->
......@@ -36,14 +36,14 @@
<div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">TRANSPORTATION RESERVATION</div>
</el-col>
<el-col :sm="12" :lg="4" :xs="12">
<div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">Venue Introduction</div>
<div class="item" @click="popRemark(10)"><img src="@/assets/dance/btn04.png">TICKET SERVICES</div>
</el-col>
<el-col :sm="12" :lg="4" :xs="12">
<div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">Media Registration</div>
</el-col>
<el-col :sm="12" :lg="4" :xs="12">
<div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">Around Activity</div>
</el-col>
<!-- <el-col :sm="12" :lg="4" :xs="12">-->
<!-- <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">Around Activity</div>-->
<!-- </el-col>-->
<!-- <el-col :sm="12" :lg="4" :xs="12">-->
<!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">live streaming</div>-->
......@@ -167,6 +167,7 @@ function popRemark(type) {
|| (form.value.isFoodView == 0 && type == '3')
|| (form.value.isMealView == 0 && type == '4')
|| (form.value.isPhotoView == 0 && type == '5')
|| (form.value.isTicketView == 0 && type == '10')
) {
building()
return
......@@ -182,13 +183,14 @@ function popRemark(type) {
function goBooking(n) {
switch (n) {
case 0:
case 10:
// 票务
router.push({
path: `/booking/ticket/${props.matchId}`,
// router.push({
// path: `/booking/ticket/${props.matchId}`,
// params: {id:props.matchId},
// query: {id: props.matchId}
})
// })
break;
case 1:
//酒店
......@@ -220,7 +222,8 @@ function goBooking(n) {
//border-radius: 20px;
}
:deep(.el-col){ max-width: 20%;
flex: 0 0 20%;}
.item {
box-shadow: 0px 0px 21px 0px rgba(41, 23, 101, 0.14);
margin: 10px 0;
......
......@@ -8,7 +8,7 @@
<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==10" class="plr20" v-html="form.reserveDesTitck"></div>
</div>
<template #footer>
<div class="dialog-footer text-center">
......
......@@ -503,6 +503,16 @@ const gopicliveUrl = () => {
ElMessage.warning( 'No live' )
}
}
const goDetail = (n) => {
if (n.isOut === '1') {
window.open(n.jumpUrl)
} else {
router.push({
path: `/news/detail/${n.noteId}`
})
}
}
</script>
<style scoped lang="scss">
......
......@@ -66,7 +66,7 @@
{{ c.code }}:{{ c.name }} {{c.danceType}}
<div>{{ c.danceTypeDetailStr }}</div>
</div>
<div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div>
<div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
</div>
</el-checkbox>
</el-checkbox-group>
......
......@@ -92,7 +92,7 @@
{{ c.code }}:{{ c.name }}
<div>{{ c.danceTypeDetailStr }}</div>
</div>
<div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div>
<div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
</div>
</el-checkbox>
</el-checkbox-group>
......
......@@ -105,7 +105,7 @@
<div v-if="c.danceType=='Breaking'">--</div>
<div v-else>{{c.danceTypeDetailStr}}</div>
</div>
<div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div>
<div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
</div>
</el-checkbox>
</el-checkbox-group>
......
......@@ -86,7 +86,7 @@
{{ c.code }}:{{ c.name }}
<div>{{ c.danceTypeDetailStr }}</div>
</div>
<div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div>
<div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
</div>
</el-checkbox>
</el-checkbox-group>
......
......@@ -60,7 +60,7 @@
</el-table-column>
<el-table-column :label="language==0?'服务费':'Registration Fee'" width="160" align="center">
<template #default="scope">
<div class="text-primary">{{ language==0?'¥':'' }}{{ scope.row.serviceFee }}</div>
<div class="text-primary">{{ language==0?'¥':'$' }}{{ scope.row.serviceFee }}</div>
</template>
</el-table-column>
</el-table>
......
......@@ -54,7 +54,7 @@
</el-table-column>
<el-table-column :fixed="hasAction?false:'right'" min-width="100" align="center" :label="language==0?'保险费':'Premium'" prop="insuranceFee">
<template #default="scope">
<span class="text-primary">{{ language==0?'¥':'' }}{{ scope.row.insuranceFee }}</span>
<span class="text-primary">{{ language==0?'¥':'$' }}{{ scope.row.insuranceFee }}</span>
</template>
</el-table-column>
<!-- 补充信息-->
......@@ -83,7 +83,7 @@
<div>
{{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span>
{{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span>
{{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'$' }}{{ total }}</span>
</div>
</div>
......
......@@ -33,7 +33,7 @@
<el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop="">
<template #default="scope">
<div class="text-primary">
{{ language==0?'¥':'' }}{{ scope.row.project.serviceFee }}
{{ language==0?'¥':'$' }}{{ scope.row.project.serviceFee }}
</div>
</template>
</el-table-column>
......@@ -50,7 +50,7 @@
<div>
{{ language==0?'总报项数':'Count' }}: <span class="mr20">{{ list.length }}</span>
{{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span>
{{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'$' }}{{ total }}</span>
</div>
</div>
</template>
......
......@@ -135,7 +135,7 @@
<td>
<span v-for="s in row.athletes">{{ s.name }},</span>
</td>
<td> {{ language == 0 ? '¥' : '' }}{{ row.project.serviceFee }}</td>
<td> {{ language == 0 ? '¥' : '$' }}{{ row.project.serviceFee }}</td>
</tr>
</table>
</div>
......@@ -204,7 +204,7 @@
<div>
{{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span>
{{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span>
{{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'$' }}{{ total }}</span>
</div>
</div>
</div>
......
......@@ -87,12 +87,12 @@
<div v-if="Number(form.totalFee)>0" class="flex">
<div v-if="signInfoList?.length>0" class="item"><label>{{
language == 0 ? '参赛服务费' : 'REGISTRATION FEE'
}}:</label><span>{{ language == 0 ? '¥' : '' }}{{ serviceFeeTotal }}</span></div>
}}:</label><span>{{ language == 0 ? '¥' : '$' }}{{ serviceFeeTotal }}</span></div>
<div v-if="zuTableList?.length>0" class="item"><label>{{
language == 0 ? '保险费' : 'INSURANCE'
}}:</label><span>{{ language == 0 ? '¥' : '' }}{{ insuranceFeeTotal }}</span></div>
}}:</label><span>{{ language == 0 ? '¥' : '$' }}{{ insuranceFeeTotal }}</span></div>
<div class="item"><label>{{ language == 0 ? '费用总计' : 'Total Cost' }}:</label><span
class="size26">{{ language == 0 ? '¥' : '' }}{{ form.totalFee }}</span></div>
class="size26">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee }}</span></div>
</div>
</el-col>
</el-row>
......@@ -133,16 +133,16 @@
</el-col>
<el-col v-if="Number(form.totalFee)>0" :lg="12">
<div v-if="form.payStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}:<span
class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div>
class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div v-else-if="form.payStatus=='1'" class="priceb">{{
language == 0 ? '线下支付待核销' : 'Amount Due'
}}:<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div>
}}:<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div v-else-if="form.payStatus=='3'" class="priceb">{{ language == 0 ? '已支付金额' : 'Amount Due' }}:<span
class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div>
class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div v-else-if="form.payStatus=='5'" class="priceb">{{ language == 0 ? '已退款' : 'Refunded' }}:<span
class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div>
class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div v-else class="priceb">{{ language == 0 ? '费用总计' : 'Amount Due' }}:<span
class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div>
class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
</el-col>
</el-row>
</el-card>
......@@ -260,7 +260,7 @@
<tr>
<th>{{ language == 0 ? '付款金额' : 'Payment Amount' }}</th>
<td>
{{ language == 0 ? '¥' : '' }}{{ totalFee }}
{{ language == 0 ? '¥' : '$' }}{{ totalFee }}
<div class="text-gray">{{
language == 0 ? '请按照指定金额进行打款' : 'Please make the payment according to the specified amount'
}}
......@@ -335,7 +335,7 @@
<SuccessFilled/>
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ form.totalFee || 0 }}</h3>
<h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee || 0 }}</h3>
<el-button v-if="language != 0" class="btn-lineG w200px" round type="primary" @click="downInvoice">
{{ language == 0 ? '下载收据' : 'DownLoad Invoice' }}
......@@ -350,7 +350,7 @@
<SuccessFilled/>
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successfully!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ form.totalFee }}</h3>
<h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee }}</h3>
<span v-if="language==0"
class="text-danger size12">*您可以在上传汇款单完成后,与联系人进行电话确认。具体缴费结果,可以在个人中心-我的报名中查看进度</span>
<span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
......
......@@ -66,9 +66,9 @@
<el-row class="priceBar">
<el-col :lg="12" :xs="24" class="pd20">
<div class="flex">
<div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
<div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptInsuranceFee?.totalFee}}</span></div>
<div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'' }}{{form.totalFee}}</span></div>
<div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'$' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
<div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'$' }}{{form.cptInsuranceFee?.totalFee}}</span></div>
<div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'$' }}{{form.totalFee}}</span></div>
</div>
</el-col>
<el-col :lg="12" :xs="24" class="text-right pd20">
......
......@@ -10,7 +10,7 @@
<el-col :lg="12" :sm="24" :md="12">
<div class="liveImgbox" @click="goDetail(newsList[0])">
<!-- <i class="ii">直播中</i>-->
<img :src="fillImgUrl_webSite(newsList[0]?.picUrl)">
<el-image :src="fillImgUrl_webSite(newsList[0]?.picUrl)"/>
<h3 class="esp">{{ newsList[0]?.name }}
</h3>
</div>
......@@ -19,27 +19,26 @@
<el-row :gutter="20">
<el-col :md="12" :lg="12">
<div class="videoImgbox" @click="goDetail(newsList[1])">
<img :src="fillImgUrl_webSite(newsList[1]?.picUrl)">
<el-image :src="fillImgUrl_webSite(newsList[1]?.picUrl)"/>
</div>
</el-col>
<el-col :md="12" :lg="12">
<div class="videoImgbox" @click="goDetail(newsList[2])">
<img :src="fillImgUrl_webSite(newsList[2]?.picUrl)">
<el-image :src="fillImgUrl_webSite(newsList[2]?.picUrl)"/>
</div>
</el-col>
<el-col :md="12" :lg="12" class="mt20">
<div class="videoImgbox" @click="goDetail(newsList[3])">
<img :src="fillImgUrl_webSite(newsList[3]?.picUrl)">
<el-image :src="fillImgUrl_webSite(newsList[3]?.picUrl)"/>
</div>
</el-col>
<el-col :md="12" :lg="12" class="mt20">
<div class="videoImgbox" @click="goDetail(newsList[4])">
<img :src="fillImgUrl_webSite(newsList[4]?.picUrl)">
<el-image :src="fillImgUrl_webSite(newsList[4]?.picUrl)"/>
</div>
</el-col>
</el-row>
</el-col>
</el-row>
......@@ -47,7 +46,7 @@
<h3 class="leftboderTT">{{ language==0?'精彩图片':'PHOTOS' }}</h3>
<a class="more" @click="goList(query2.sortId,language==0?'精彩图片':'PHOTOS')">MORE</a>
</div>
<el-row class="mb20" :gutter="20">
<el-row class="mb20" :gutter="20" v-loading="loading">
<el-col :lg="9">
<div class="picbox" @click="goDetail(newsList2[0])"><img :src="fillImgUrl_webSite(newsList2[0]?.picUrl)"/></div>
</el-col>
......@@ -88,6 +87,7 @@ const total = ref(0)
const list = ref([])
const newsList = ref([])
const newsList2 = ref([])
const loading = ref(true)
const query1 = ref({
pageSize: 5,
pageNum: 1,
......@@ -110,6 +110,7 @@ const getList = (obj) => {
}
getNewsListById(obj).then(res => {
newsList.value = res.rows
loading.value = false
})
}
const getList2 = (obj) => {
......@@ -118,6 +119,7 @@ const getList2 = (obj) => {
}
getNewsListById(obj).then(res => {
newsList2.value = res.rows
loading.value = false
})
}
......
......@@ -3,14 +3,14 @@
width="480" :append-to-body="true" destroy-on-close @close="close" center>
<div>
<el-form class="d-form" size="large" :label-width="language==0?80:150" :label-position="language==0?'right':'top'" style="max-width: 500px;margin: auto">
<div style="display: flex;gap: 20px;">
<!-- <div style="display: flex;gap: 20px;">-->
<el-form-item :label="language==0?'姓':'Last Name'" required style="width: 100%;">
<el-input type="text" v-model="form.lastName" :placeholder="language==0?'请输入您的姓':'Please enter your last name'"/>
</el-form-item>
<el-form-item :label="language==0?'名':'First Name'" required style="width: 100%;">
<el-input type="text" v-model="form.firstName" :placeholder="language==0?'请输入您的名':'Please enter your first name'"/>
</el-form-item>
</div>
<!-- </div>-->
<el-form-item :label="language==0?'邮箱':'E-mail'" required>
<el-input type="text" v-model="form.account" @change="resetCode" @blur="verifyCode"
/>
......
......@@ -111,7 +111,7 @@
{{ languageFormat(language, "共计", "Total") }}
</div>
<div class="price_num">
<span>{{ language == 0 ? "¥" : "" }}</span>
<span>{{ language == 0 ? "¥" : "$" }}</span>
{{ order.data?.paymentAmount }}
</div>
</div>
......@@ -125,7 +125,7 @@
{{ languageFormat(language, "共计金额", "Subtotal") }}
</span>
<span class="value">
<span>{{ language == 0 ? "¥" : "" }}</span>
<span>{{ language == 0 ? "¥" : "$" }}</span>
{{ order.data?.paymentAmount }}
</span>
</div>
......
......@@ -326,14 +326,14 @@ const showSJ = () => {
<div style="width: 33%" class="td">{{ detail.data?.name }}</div>
<div style="width: 25%" class="td">{{ detail.data?.placeName }}</div>
<div style="width: 20%" class="td">
<span>{{ detail.data?.language == 'zh-cn' ? "¥" : "" }}</span>
<span>{{ detail.data?.language == 'zh-cn' ? "¥" : "$" }}</span>
{{ detail.data?.singlePrice }}
</div>
<div style="width: 10%" class="td">
x{{ detail.data?.seatList?.length }}
</div>
<div style="width: 12%; text-align: right" class="td">
<span>{{ detail.data?.language == 'zh-cn' ? "¥" : "" }}</span>
<span>{{ detail.data?.language == 'zh-cn' ? "¥" : "$" }}</span>
{{ detail.data?.payAmount }}
</div>
</div>
......@@ -454,7 +454,7 @@ const showSJ = () => {
class="value"
:style="{ color: status[detail.data?.state]?.color }"
>
<span>{{ detail.data?.language == 'zh-cn' ? "¥" : "" }}</span>
<span>{{ detail.data?.language == 'zh-cn' ? "¥" : "$" }}</span>
{{ detail.data?.payAmount }}
</div>
</div>
......
......@@ -235,7 +235,7 @@ onMounted(() => {
}}{{ languageFormat(language, "张", "tickets") }}
</div>
<div class="common">
{{ languageFormat(language, "金额", "Ticket Price") }}{{it.payType=='2'?'':'¥'}}{{ it.payAmount }}
{{ languageFormat(language, "金额", "Ticket Price") }}{{it.payType=='2'?'$':'¥'}}{{ it.payAmount }}
</div>
<div class="status">
<div class="label">
......
......@@ -321,7 +321,7 @@ price.fetchData();
<img class="seat" :src="it.unSelectIcon" />
<span class="price">
{{ it.price }}
<span>{{ language == 0 ? "¥" : "" }}</span>
<span>{{ language == 0 ? "¥" : "$" }}</span>
</span>
</div>
</div>
......@@ -349,7 +349,7 @@ price.fetchData();
</div>
<div class="pay">
<div class="sum">
<span>{{ language == 0 ? "¥" : "" }}</span>
<span>{{ language == 0 ? "¥" : "$" }}</span>
{{ sumPrice?.toFixed(2) }}
</div>
<div class="pay_btn" @click="toConfirmOrder()">
......
......@@ -389,7 +389,7 @@ watch(
]"
@click="select_form.onClickPrice(it)"
>
<span v-if="language == 1"></span>
<span v-if="language == 1">$</span>
{{ it.price }}
<span v-if="language == 0"></span>
</div>
......
......@@ -76,14 +76,14 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
'/dev-api/ztx-webSite': {
target: 'http://192.168.1.118:8082/',
target: 'https://ces.2025wtcwuxi.com/stage-api/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.118:8082/',
// target: 'http://192.168.1.118:8082/',
// target: 'http://192.168.1.131:8081/',
// target: 'https://www.2025wtcwuxi.com/stage-api/',
target: 'https://ces.2025wtcwuxi.com/stage-api/',
// target: 'http://124.70.181.90:1880/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!