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 { ...@@ -178,7 +178,7 @@ li.el-select-dropdown__item {
178 .el-menu--horizontal { 178 .el-menu--horizontal {
179 height: 35px; 179 height: 35px;
180 border-bottom: none; 180 border-bottom: none;
181 justify-content: space-between; 181 justify-content: start;
182 } 182 }
183 183
184 .el-menu--horizontal > .el-menu-item { 184 .el-menu--horizontal > .el-menu-item {
......
...@@ -56,6 +56,12 @@ ...@@ -56,6 +56,12 @@
56 </div> 56 </div>
57 <div class="fixed-right forPc"> 57 <div class="fixed-right forPc">
58 <div class="mlb" v-if="language===0"> 58 <div class="mlb" v-if="language===0">
59 <div @click="goAround" class="mb10 pb5">
60 <a>
61 <img class="kf" src="@/assets/logo/btn02.png"/>
62 <div class="text-center mt10">周边活动</div>
63 </a>
64 </div>
59 <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="客服" > 65 <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="客服" >
60 <img class="kf" src="@/assets/logo/btn01.png"/> 66 <img class="kf" src="@/assets/logo/btn01.png"/>
61 <div class="text-center mt10">在线客服</div> 67 <div class="text-center mt10">在线客服</div>
...@@ -63,11 +69,17 @@ ...@@ -63,11 +69,17 @@
63 <!-- <div @click="goHelpZH">--> 69 <!-- <div @click="goHelpZH">-->
64 <!-- <a>--> 70 <!-- <a>-->
65 <!-- <img class="kf" src="@/assets/logo/btn02.png"/>--> 71 <!-- <img class="kf" src="@/assets/logo/btn02.png"/>-->
66 <!-- <div class="text-center mt10">参赛指南</div>--> 72 <!-- <div class="text-center mt10">周边活动</div>-->
67 <!-- </a>--> 73 <!-- </a>-->
68 <!-- </div>--> 74 <!-- </div>-->
69 </div> 75 </div>
70 <div class="mlb" v-else> 76 <div class="mlb" v-else>
77 <div @click="goAround" class="mb10 pb5">
78 <a>
79 <img class="kf" src="@/assets/logo/btn02.png"/>
80 <div class="text-center mt10">周边活动</div>
81 </a>
82 </div>
71 <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"> 83 <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">
72 <img class="kf" src="@/assets/logo/btn01.png"/> 84 <img class="kf" src="@/assets/logo/btn01.png"/>
73 <div class="text-center ">LIVE CHAT</div> 85 <div class="text-center ">LIVE CHAT</div>
...@@ -103,6 +115,10 @@ const goHelpZH = () => { ...@@ -103,6 +115,10 @@ const goHelpZH = () => {
103 } 115 }
104 }) 116 })
105 } 117 }
118 const goAround = () => {
119 //周边活动
120 router.push({path: `/about/wuDao`,query: {activeIndex: '2'}})
121 }
106 </script> 122 </script>
107 123
108 <style lang="scss" scoped> 124 <style lang="scss" scoped>
......
...@@ -176,19 +176,21 @@ onMounted(() => { ...@@ -176,19 +176,21 @@ onMounted(() => {
176 if (user) { 176 if (user) {
177 isLogin.value = true 177 isLogin.value = true
178 } 178 }
179 if (route.fullPath.indexOf('news') > -1) { 179 })
180 watch(() => route.fullPath, (val) => {
181 if (val.indexOf('news') > -1) {
180 activeIndex.value = '/news' 182 activeIndex.value = '/news'
181 } else if (route.fullPath.indexOf('notice') > -1) { 183 } else if (val.indexOf('notice') > -1) {
182 activeIndex.value = '/notice' 184 activeIndex.value = '/notice'
183 } else if (route.fullPath.indexOf('about') > -1) { 185 } else if (val.indexOf('about') > -1) {
184 activeIndex.value = '/about' 186 activeIndex.value = '/about'
185 } else if (route.fullPath.indexOf('meta') > -1) { 187 } else if (val.indexOf('meta') > -1) {
186 activeIndex.value = '/meta' 188 activeIndex.value = '/meta'
187 } else if (route.fullPath.indexOf('guide') > -1) { 189 } else if (val.indexOf('guide') > -1) {
188 activeIndex.value = '/guide' 190 activeIndex.value = '/guide'
189 } else if (route.fullPath.indexOf('saiC') > -1) { 191 } else if (val.indexOf('saiC') > -1) {
190 activeIndex.value = '/saiC' 192 activeIndex.value = '/saiC'
191 } else if (route.fullPath.indexOf('match') > -1) { 193 } else if (val.indexOf('match') > -1) {
192 activeIndex.value = '/match/list' 194 activeIndex.value = '/match/list'
193 } 195 }
194 console.log(activeIndex.value) 196 console.log(activeIndex.value)
......
...@@ -57,11 +57,7 @@ ...@@ -57,11 +57,7 @@
57 <el-menu-item index="/saiC">赛程安排</el-menu-item> 57 <el-menu-item index="/saiC">赛程安排</el-menu-item>
58 <el-menu-item index="/meta">媒体中心</el-menu-item> 58 <el-menu-item index="/meta">媒体中心</el-menu-item>
59 <!-- <el-menu-item index="/guide">参赛指南</el-menu-item>--> 59 <!-- <el-menu-item index="/guide">参赛指南</el-menu-item>-->
60 <el-sub-menu index="/about"> 60 <el-menu-item index="/about/wuDao">关于我们</el-menu-item>
61 <template #title>关于我们</template>
62 <el-menu-item index="/about/wuDao">舞蹈节</el-menu-item>
63 <el-menu-item index="/about/culture">地方文化</el-menu-item>
64 </el-sub-menu>
65 </el-menu> 61 </el-menu>
66 <el-menu class="weiMenu" 62 <el-menu class="weiMenu"
67 v-if="language==1" 63 v-if="language==1"
......
...@@ -70,7 +70,6 @@ const menu = ref([ ...@@ -70,7 +70,6 @@ const menu = ref([
70 {name:'组织机构',ename:'Organizer'}, 70 {name:'组织机构',ename:'Organizer'},
71 {name:'2025WTC世锦赛',ename:'2025WTC World Tournament'}, 71 {name:'2025WTC世锦赛',ename:'2025WTC World Tournament'},
72 {name:'周边活动',ename:'Around Activity'}, 72 {name:'周边活动',ename:'Around Activity'},
73 // {name:'体育舞蹈项目',ename:''},
74 ]) 73 ])
75 74
76 const contact = ref([ 75 const contact = ref([
......
...@@ -26,20 +26,20 @@ ...@@ -26,20 +26,20 @@
26 <div v-if="!b.orderType&&orderType==5"> 26 <div v-if="!b.orderType&&orderType==5">
27 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}{{b.groupName}}</p> 27 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}{{b.groupName}}</p>
28 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}{{b.payTime}}</p> 28 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}{{b.payTime}}</p>
29 <p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':''}} {{b.totalPayAmount}}</p> 29 <p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':'$'}} {{b.totalPayAmount}}</p>
30 </div> 30 </div>
31 <!-- 酒店订单--> 31 <!-- 酒店订单-->
32 <div v-if="b.orderType == 0"> 32 <div v-if="b.orderType == 0">
33 <p>{{b.messageObj.roomInfo}}</p> 33 <p>{{b.messageObj.roomInfo}}</p>
34 <p>{{b.messageObj.roomStayDate}}</p> 34 <p>{{b.messageObj.roomStayDate}}</p>
35 <p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 35 <p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
36 </div> 36 </div>
37 <!-- 接送订单--> 37 <!-- 接送订单-->
38 <div v-if="b.orderType == 1"> 38 <div v-if="b.orderType == 1">
39 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0"> 39 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
40 <span>{{car.name}}{{car.num}}</span> 40 <span>{{car.name}}{{car.num}}</span>
41 </p> 41 </p>
42 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 42 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
43 </div> 43 </div>
44 <!-- 餐饮订单--> 44 <!-- 餐饮订单-->
45 <div v-if="b.orderType == 2"> 45 <div v-if="b.orderType == 2">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 {{n.name}}({{n.categoryName}}) <span>{{n.num}}</span> 48 {{n.name}}({{n.categoryName}}) <span>{{n.num}}</span>
49 </span> 49 </span>
50 </p> 50 </p>
51 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'' :'¥' }}{{b.total}}</p> 51 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'$' :'¥' }}{{b.total}}</p>
52 </div> 52 </div>
53 <div v-if="b.orderType == 3 || b.orderType == 4"> 53 <div v-if="b.orderType == 3 || b.orderType == 4">
54 <div> 54 <div>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 <div> 57 <div>
58 {{language==0?'预约时间:':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}} 58 {{language==0?'预约时间:':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
59 </div> 59 </div>
60 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 60 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
61 </div> 61 </div>
62 </div> 62 </div>
63 63
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
66 <h3>{{ formDate.name }}</h3> 66 <h3>{{ formDate.name }}</h3>
67 <div> 67 <div>
68 <p>地点:{{formDate.placeName}}</p> 68 <p>地点:{{formDate.placeName}}</p>
69 <p>单价:{{paymentType!=2?'¥':''}}{{formDate.singlePrice}}</p> 69 <p>单价:{{paymentType!=2?'¥':'$'}}{{formDate.singlePrice}}</p>
70 <p>数量:{{formDate.seatList?.length}}</p> 70 <p>数量:{{formDate.seatList?.length}}</p>
71 <p class="poPrice">{{paymentType!=2?'¥':''}}{{formDate.payAmount}}</p> 71 <p class="poPrice">{{paymentType!=2?'¥':'$'}}{{formDate.payAmount}}</p>
72 </div> 72 </div>
73 </div> 73 </div>
74 74
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
76 <div class="border-rr mt20 pd20"> 76 <div class="border-rr mt20 pd20">
77 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef"> 77 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
78 <el-form-item :label="language == 0 ?'开票金额':'Amount'"> 78 <el-form-item :label="language == 0 ?'开票金额':'Amount'">
79 <span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':''}}{{totalMoney}}</span> 79 <span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'$'}}{{totalMoney}}</span>
80 <span v-else class="bigprice">{{paymentType!=3?'¥':''}}{{totalMoney}}</span> 80 <span v-else class="bigprice">{{paymentType!=3?'¥':'$'}}{{totalMoney}}</span>
81 </el-form-item> 81 </el-form-item>
82 82
83 <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm"> 83 <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm">
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 68
69 </div> 69 </div>
70 <div v-else class="price"> 70 <div v-else class="price">
71 71 $
72 <span 72 <span
73 v-if="r.outPriceEn&&r.inPriceEn">{{ (Number(r.inPriceEn) || 0) > Number(r.outPriceEn) ? r.outPriceEn : r.inPriceEn }}</span> 73 v-if="r.outPriceEn&&r.inPriceEn">{{ (Number(r.inPriceEn) || 0) > Number(r.outPriceEn) ? r.outPriceEn : r.inPriceEn }}</span>
74 <span v-else-if="r.inPriceEn>0">{{ r.inPriceEn }}</span> 74 <span v-else-if="r.inPriceEn>0">{{ r.inPriceEn }}</span>
......
...@@ -126,23 +126,23 @@ ...@@ -126,23 +126,23 @@
126 <div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div> 126 <div class="leftboderTT">{{ language == 0 ? '订单明细' : 'Order details' }}</div>
127 <div class="border-rr mt20 pd20 ccitemBox"> 127 <div class="border-rr mt20 pd20 ccitemBox">
128 <label v-show="form.useType.indexOf('0')>-1"> {{ language == 0 ? '接站车辆费' : 'Room fee' }} 128 <label v-show="form.useType.indexOf('0')>-1"> {{ language == 0 ? '接站车辆费' : 'Room fee' }}
129 <span class="fr">{{ language == 0 ? '¥' : '' }}{{ form.pickUpBo.total }}</span> 129 <span class="fr">{{ language == 0 ? '¥' : '$' }}{{ form.pickUpBo.total }}</span>
130 </label> 130 </label>
131 <div v-show="form.useType.indexOf('0')>-1" class="ccitem"> 131 <div v-show="form.useType.indexOf('0')>-1" class="ccitem">
132 {{ car.name }} 132 {{ car.name }}
133 <span>{{ form.num }} *{{ language == 0 ? '¥' : '' }}{{ car.inPrice }}</span> 133 <span>{{ form.num }} *{{ language == 0 ? '¥' : '$' }}{{ car.inPrice }}</span>
134 </div> 134 </div>
135 <label v-show="form.useType.indexOf('1')>-1">{{ language == 0 ? '送站车辆费' : 'Extra bed fee' }} 135 <label v-show="form.useType.indexOf('1')>-1">{{ language == 0 ? '送站车辆费' : 'Extra bed fee' }}
136 <span class="fr">{{ language == 0 ? '¥' : '' }}{{ form.dropOffBo.total }}</span> 136 <span class="fr">{{ language == 0 ? '¥' : '$' }}{{ form.dropOffBo.total }}</span>
137 </label> 137 </label>
138 138
139 <div v-show="form.useType.indexOf('1')>-1" class="ccitem"> 139 <div v-show="form.useType.indexOf('1')>-1" class="ccitem">
140 {{ car.name }} 140 {{ car.name }}
141 <span>{{ form.num }}*{{ language == 0 ? '¥' : '' }}{{ car.outPrice }}</span> 141 <span>{{ form.num }}*{{ language == 0 ? '¥' : '$' }}{{ car.outPrice }}</span>
142 </div> 142 </div>
143 143
144 <label>{{ language == 0 ? '共计' : 'Total' }}<span 144 <label>{{ language == 0 ? '共计' : 'Total' }}<span
145 class="fr bigMoney">{{ language == 0 ? '¥' : '' }}{{ money }}</span></label> 145 class="fr bigMoney">{{ language == 0 ? '¥' : '$' }}{{ money }}</span></label>
146 146
147 </div> 147 </div>
148 </el-col> 148 </el-col>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
153 <el-row align="middle" justify="space-between"> 153 <el-row align="middle" justify="space-between">
154 <el-col :lg="12"> 154 <el-col :lg="12">
155 <label>{{ language == 0 ? '共计金额' : 'Total' }} 155 <label>{{ language == 0 ? '共计金额' : 'Total' }}
156 <span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ 156 <span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{
157 money 157 money
158 }}</span></span> 158 }}</span></span>
159 </label> 159 </label>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 </el-col> 80 </el-col>
81 81
82 <el-col :lg="4" :sm="12" :xs="12" class="zh-margin"> 82 <el-col :lg="4" :sm="12" :xs="12" class="zh-margin">
83 <span style="font-size: 24px">{{ language==0?'¥':''}} </span> 83 <span style="font-size: 24px">{{ language==0?'¥':'$'}} </span>
84 {{language==0?n.mealPrice:n.mealPriceEn}} 84 {{language==0?n.mealPrice:n.mealPriceEn}}
85 </el-col> 85 </el-col>
86 <el-col :lg="6" :sm="12" :xs="12" class="forPc"> 86 <el-col :lg="6" :sm="12" :xs="12" class="forPc">
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
73 </el-col> 73 </el-col>
74 </el-row> 74 </el-row>
75 <el-row> 75 <el-row>
76 <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> 76 <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>
77 <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> 77 <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>
78 </el-row> 78 </el-row>
79 </el-row> 79 </el-row>
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 {{h.addName}} 27 {{h.addName}}
28 </p> 28 </p>
29 <div class="price mb10" v-if="language==0"><i class="text-warning">¥</i><span class="text-warning">{{ h.price || 0 }}</span></div> 29 <div class="price mb10" v-if="language==0"><i class="text-warning">¥</i><span class="text-warning">{{ h.price || 0 }}</span></div>
30 <div class="price mb10" v-else><i class="text-warning"></i><span class="text-warning">{{ h.price || 0 }}</span>start</div> 30 <div class="price mb10" v-else><i class="text-warning">$</i><span class="text-warning">{{ h.price || 0 }}</span>start</div>
31 <el-button class="btn-lineG" round type="primary" size="large" @click="goDetail(h)">{{ language==0?'立即预约':'Select' }}</el-button> 31 <el-button class="btn-lineG" round type="primary" size="large" @click="goDetail(h)">{{ language==0?'立即预约':'Select' }}</el-button>
32 32
33 </el-col> 33 </el-col>
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 </el-col> 55 </el-col>
56 <el-col :span="3"> 56 <el-col :span="3">
57 <div class="price">{{ 57 <div class="price">{{
58 language == 0 ? '¥' : '' 58 language == 0 ? '¥' : '$'
59 }}<span>{{ language == 0 ? r.foodPrice : r.foodPriceEn }}</span></div> 59 }}<span>{{ language == 0 ? r.foodPrice : r.foodPriceEn }}</span></div>
60 </el-col> 60 </el-col>
61 <el-col :span="3"> 61 <el-col :span="3">
......
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
65 <label> {{food.name }}</label> 65 <label> {{food.name }}</label>
66 <div class="ccitem" v-for="(c, index) in choseDays" :key="index"> 66 <div class="ccitem" v-for="(c, index) in choseDays" :key="index">
67 {{ c }} 67 {{ c }}
68 <span>{{ form.num }}*{{ language == 0 ? '¥' : '' }}{{ language == 0 ?food.foodPrice:food.foodPriceEn }}</span> 68 <span>{{ form.num }}*{{ language == 0 ? '¥' : '$' }}{{ language == 0 ?food.foodPrice:food.foodPriceEn }}</span>
69 </div> 69 </div>
70 70
71 <label>{{ language == 0 ? '共计' : 'Total' }}<span 71 <label>{{ language == 0 ? '共计' : 'Total' }}<span
72 class="fr bigMoney">{{ language == 0 ? '¥' : '' }}{{ form.total }}</span></label> 72 class="fr bigMoney">{{ language == 0 ? '¥' : '$' }}{{ form.total }}</span></label>
73 73
74 </div> 74 </div>
75 </el-col> 75 </el-col>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 <el-row justify="space-between" align="middle"> 80 <el-row justify="space-between" align="middle">
81 <el-col :lg="12"> 81 <el-col :lg="12">
82 <label>{{ language == 0 ? '共计金额' : 'Total' }} 82 <label>{{ language == 0 ? '共计金额' : 'Total' }}
83 <span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ form.total }}</span></span> 83 <span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{ form.total }}</span></span>
84 </label> 84 </label>
85 </el-col> 85 </el-col>
86 <el-col :lg="12" class="text-right"> 86 <el-col :lg="12" class="text-right">
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
39 </p> 39 </p>
40 </el-col> 40 </el-col>
41 <el-col :lg="4" :md="4" class="text-right"> 41 <el-col :lg="4" :md="4" class="text-right">
42 <div class="price">{{ language==0?'¥':'' }}<span>{{ h.price }}</span> 42 <div class="price">{{ language==0?'¥':'$' }}<span>{{ h.price }}</span>
43 <i v-if="language==0"></i> 43 <i v-if="language==0"></i>
44 </div> 44 </div>
45 <el-button class="w200px blackBtn" round type="primary" >{{ language==0?'立即预订':'Select' }}</el-button> 45 <el-button class="w200px blackBtn" round type="primary" >{{ language==0?'立即预订':'Select' }}</el-button>
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 </el-col> 145 </el-col>
146 <el-col :lg="3" :md="12" :sm="12" :xs="12"> 146 <el-col :lg="3" :md="12" :sm="12" :xs="12">
147 <div class="price">{{ 147 <div class="price">{{
148 language == 0 ? '¥' : '' 148 language == 0 ? '¥' : '$'
149 }}<span>{{ language == 0 ? r.roomPrice : r.roomPriceEn }}</span></div> 149 }}<span>{{ language == 0 ? r.roomPrice : r.roomPriceEn }}</span></div>
150 </el-col> 150 </el-col>
151 <el-col :lg="3" :md="12" :sm="12" :xs="12"> 151 <el-col :lg="3" :md="12" :sm="12" :xs="12">
......
...@@ -93,34 +93,34 @@ ...@@ -93,34 +93,34 @@
93 <div class="border-rr mt20 pd20 ccitemBox"> 93 <div class="border-rr mt20 pd20 ccitemBox">
94 <label> {{ language == 0 ? '房费' : 'Room fee' }} 94 <label> {{ language == 0 ? '房费' : 'Room fee' }}
95 <span class="fr" v-if="language==0">{{ 95 <span class="fr" v-if="language==0">{{
96 language == 0 ? '¥' : '' 96 language == 0 ? '¥' : '$'
97 }}{{ (room.roomPrice * form.roomNum * choseRooms.length).toFixed(2) }}</span> 97 }}{{ (room.roomPrice * form.roomNum * choseRooms.length).toFixed(2) }}</span>
98 <span class="fr" v-else>{{ 98 <span class="fr" v-else>{{
99 language == 0 ? '¥' : '' 99 language == 0 ? '¥' : '$'
100 }}{{ (room.roomPriceEn * form.roomNum * choseRooms.length).toFixed(2) }}</span> 100 }}{{ (room.roomPriceEn * form.roomNum * choseRooms.length).toFixed(2) }}</span>
101 </label> 101 </label>
102 <div class="ccitem" v-for="(c, index) in choseRooms" :key="index" v-show="form.roomNum>0"> 102 <div class="ccitem" v-for="(c, index) in choseRooms" :key="index" v-show="form.roomNum>0">
103 {{ c }} 103 {{ c }}
104 <span v-if="language==0">{{ form.roomNum }}*{{ language == 0 ? '¥' : '' }}{{ room.roomPrice }}</span> 104 <span v-if="language==0">{{ form.roomNum }}*{{ language == 0 ? '¥' : '$' }}{{ room.roomPrice }}</span>
105 <span v-else>{{ form.roomNum }}*{{ language == 0 ? '¥' : '' }}{{ room.roomPriceEn }}</span> 105 <span v-else>{{ form.roomNum }}*{{ language == 0 ? '¥' : '$' }}{{ room.roomPriceEn }}</span>
106 </div> 106 </div>
107 107
108 <label v-if="form.isAddbed=='1'&&form.addNum>0">{{ language == 0 ? '加床费' : 'Extra bed fee' }} 108 <label v-if="form.isAddbed=='1'&&form.addNum>0">{{ language == 0 ? '加床费' : 'Extra bed fee' }}
109 <span class="fr" v-if="language==0">{{ 109 <span class="fr" v-if="language==0">{{
110 language == 0 ? '¥' : '' 110 language == 0 ? '¥' : '$'
111 }}{{ (room.bedPrice * form.addNum * choseRooms.length).toFixed(2) }}</span> 111 }}{{ (room.bedPrice * form.addNum * choseRooms.length).toFixed(2) }}</span>
112 <span class="fr" v-else>{{ 112 <span class="fr" v-else>{{
113 language == 0 ? '¥' : '' 113 language == 0 ? '¥' : '$'
114 }}{{ (room.bedPriceEn * form.addNum * choseRooms.length).toFixed(2) }}</span> 114 }}{{ (room.bedPriceEn * form.addNum * choseRooms.length).toFixed(2) }}</span>
115 </label> 115 </label>
116 116
117 <div v-if="form.isAddbed=='1'&&form.addNum>0" class="ccitem" v-for="(c, index) in choseRooms" :key="index"> 117 <div v-if="form.isAddbed=='1'&&form.addNum>0" class="ccitem" v-for="(c, index) in choseRooms" :key="index">
118 {{ c }} 118 {{ c }}
119 <span>{{ form.addNum }}*{{ language == 0 ? '¥' : '' }}{{ language == 0 ?room.bedPrice:room.bedPriceEn}}</span> 119 <span>{{ form.addNum }}*{{ language == 0 ? '¥' : '$' }}{{ language == 0 ?room.bedPrice:room.bedPriceEn}}</span>
120 </div> 120 </div>
121 121
122 <label>{{ language == 0 ? '共计' : 'Total' }}<span 122 <label>{{ language == 0 ? '共计' : 'Total' }}<span
123 class="fr bigMoney">{{ language == 0 ? '¥' : '' }}{{ money }}</span></label> 123 class="fr bigMoney">{{ language == 0 ? '¥' : '$' }}{{ money }}</span></label>
124 124
125 </div> 125 </div>
126 </el-col> 126 </el-col>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
131 <el-row justify="space-between" align="middle"> 131 <el-row justify="space-between" align="middle">
132 <el-col :span="12"> 132 <el-col :span="12">
133 <label>{{ language == 0 ? '共计金额' : 'Total' }} 133 <label>{{ language == 0 ? '共计金额' : 'Total' }}
134 <span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ money }}</span></span> 134 <span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{ money }}</span></span>
135 </label> 135 </label>
136 </el-col> 136 </el-col>
137 <el-col :span="12" class="text-right"> 137 <el-col :span="12" class="text-right">
......
...@@ -24,20 +24,20 @@ ...@@ -24,20 +24,20 @@
24 <div v-if="!b.orderType&&orderType==5"> 24 <div v-if="!b.orderType&&orderType==5">
25 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}{{b.groupName}}</p> 25 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}{{b.groupName}}</p>
26 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}{{b.payTime}}</p> 26 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}{{b.payTime}}</p>
27 <p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':''}} {{b.totalPayAmount}}</p> 27 <p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':'$'}} {{b.totalPayAmount}}</p>
28 </div> 28 </div>
29 <!-- 酒店订单--> 29 <!-- 酒店订单-->
30 <div v-if="b.orderType == 0"> 30 <div v-if="b.orderType == 0">
31 <p>{{b.messageObj.roomInfo}}</p> 31 <p>{{b.messageObj.roomInfo}}</p>
32 <p>{{b.messageObj.roomStayDate}}</p> 32 <p>{{b.messageObj.roomStayDate}}</p>
33 <p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 33 <p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
34 </div> 34 </div>
35 <!-- 接送订单--> 35 <!-- 接送订单-->
36 <div v-if="b.orderType == 1"> 36 <div v-if="b.orderType == 1">
37 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0"> 37 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
38 <span>{{car.name}}{{car.num}}</span> 38 <span>{{car.name}}{{car.num}}</span>
39 </p> 39 </p>
40 <p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 40 <p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
41 </div> 41 </div>
42 <!-- 餐饮订单--> 42 <!-- 餐饮订单-->
43 <div v-if="b.orderType == 2"> 43 <div v-if="b.orderType == 2">
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 {{n.name}}({{n.categoryName}}) <span>{{n.num}}</span> 46 {{n.name}}({{n.categoryName}}) <span>{{n.num}}</span>
47 </span> 47 </span>
48 </p> 48 </p>
49 <p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 49 <p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
50 </div> 50 </div>
51 <div v-if="b.orderType == 3 || b.orderType == 4"> 51 <div v-if="b.orderType == 3 || b.orderType == 4">
52 <div> 52 <div>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <div> 55 <div>
56 {{language==0?'预约时间:':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}} 56 {{language==0?'预约时间:':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
57 </div> 57 </div>
58 <p class="poPrice">{{ b.paymentType==3?'' :'¥' }}{{b.totalStr}}</p> 58 <p class="poPrice">{{ b.paymentType==3?'$' :'¥' }}{{b.totalStr}}</p>
59 </div> 59 </div>
60 </div> 60 </div>
61 <div class="border-info" v-if="orderType==6"> 61 <div class="border-info" v-if="orderType==6">
...@@ -63,17 +63,17 @@ ...@@ -63,17 +63,17 @@
63 <h3>{{ formDate.name }}</h3> 63 <h3>{{ formDate.name }}</h3>
64 <div> 64 <div>
65 <p>地点:{{formDate.placeName}}</p> 65 <p>地点:{{formDate.placeName}}</p>
66 <p>单价:{{paymentType!=2?'¥':''}}{{formDate.singlePrice}}</p> 66 <p>单价:{{paymentType!=2?'¥':'$'}}{{formDate.singlePrice}}</p>
67 <p>数量:{{formDate.seatList?.length}}</p> 67 <p>数量:{{formDate.seatList?.length}}</p>
68 <p class="poPrice">{{paymentType!=2?'¥':''}}{{formDate.payAmount}}</p> 68 <p class="poPrice">{{paymentType!=2?'¥':'$'}}{{formDate.payAmount}}</p>
69 </div> 69 </div>
70 </div> 70 </div>
71 <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div> 71 <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div>
72 <div class="border-rr mt20 pd20"> 72 <div class="border-rr mt20 pd20">
73 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef"> 73 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
74 <el-form-item :label="'开票金额'"> 74 <el-form-item :label="'开票金额'">
75 <span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':''}}{{totalMoney}}</span> 75 <span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'$'}}{{totalMoney}}</span>
76 <span v-else class="bigprice">{{paymentType!=3?'¥':''}}{{totalMoney}}</span> 76 <span v-else class="bigprice">{{paymentType!=3?'¥':'$'}}{{totalMoney}}</span>
77 </el-form-item> 77 </el-form-item>
78 78
79 <el-form-item :label="`发票形式`" required prop="invoiceForm"> 79 <el-form-item :label="`发票形式`" required prop="invoiceForm">
......
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
48 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>--> 48 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>-->
49 <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> 49 <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>
50 <div v-else style="margin-bottom: 20px">Address &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.addressEn}}</span></div> 50 <div v-else style="margin-bottom: 20px">Address &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.addressEn}}</span></div>
51 <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> 51 <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>
52 </div> 52 </div>
53 53
54 <div style="flex: 1"> 54 <div style="flex: 1">
55 <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> 55 <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>
56 <!-- <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>--> 56 <!-- <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>-->
57 </div> 57 </div>
58 </el-row> 58 </el-row>
59 </el-row> 59 </el-row>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
95 <el-row justify="space-between" align="middle"> 95 <el-row justify="space-between" align="middle">
96 <el-col :span="12"> 96 <el-col :span="12">
97 <label>{{ language == 0 ? '共计金额' : 'Total' }} 97 <label>{{ language == 0 ? '共计金额' : 'Total' }}
98 <span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ 98 <span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{
99 money 99 money
100 }}</span></span> 100 }}</span></span>
101 </label> 101 </label>
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 <el-col> 68 <el-col>
69 {{ language == 0 ? '套餐' : 'Package' }}{{ formInfo.mealName }} <span 69 {{ language == 0 ? '套餐' : 'Package' }}{{ formInfo.mealName }} <span
70 style="margin-left: 40px">{{ language == 0 ? '价格' : 'Price' }}</span><span 70 style="margin-left: 40px">{{ language == 0 ? '价格' : 'Price' }}</span><span
71 class="price">{{ language == 0 ? '¥' + formInfo.mealPrice : '' + formInfo.mealPriceEn }}</span> 71 class="price">{{ language == 0 ? '¥' + formInfo.mealPrice : '$' + formInfo.mealPriceEn }}</span>
72 <span style="margin-left: 40px">{{ 72 <span style="margin-left: 40px">{{
73 language == 0 ? '工作室电话' : 'Studio phone number' 73 language == 0 ? '工作室电话' : 'Studio phone number'
74 }}{{ formInfo.contact }}</span> 74 }}{{ formInfo.contact }}</span>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 <el-col> 102 <el-col>
103 {{ language == 0 ? '套餐' : 'Package' }}{{ formInfo.photoName }} <span 103 {{ language == 0 ? '套餐' : 'Package' }}{{ formInfo.photoName }} <span
104 style="margin-left: 40px">{{ language == 0 ? '价格' : 'Price' }}</span><span 104 style="margin-left: 40px">{{ language == 0 ? '价格' : 'Price' }}</span><span
105 class="price">{{ language == 0 ? '¥' + formInfo.photoPrice : '' + formInfo.photoPriceEn }}</span> 105 class="price">{{ language == 0 ? '¥' + formInfo.photoPrice : '$' + formInfo.photoPriceEn }}</span>
106 </el-col> 106 </el-col>
107 <el-col> 107 <el-col>
108 {{ language == 0 ? '套餐说明' : 'Package Description' }}{{ formInfo.introduction }} 108 {{ language == 0 ? '套餐说明' : 'Package Description' }}{{ formInfo.introduction }}
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
187 187
188 <span v-if="car.num > 0"> {{ car.num }}{{ 188 <span v-if="car.num > 0"> {{ car.num }}{{
189 language == 0 ? '辆' : 'Cars' 189 language == 0 ? '辆' : 'Cars'
190 }} * {{ language == 0 ? '¥' : '' }}{{ car.price }}</span> 190 }} * {{ language == 0 ? '¥' : '$' }}{{ car.price }}</span>
191 </div> 191 </div>
192 192
193 <div>{{ language == 0 ? '人数' : 'People' }} {{ form.pickUpBo.count }}</div> 193 <div>{{ language == 0 ? '人数' : 'People' }} {{ form.pickUpBo.count }}</div>
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
214 214
215 <span v-if="car.num > 0"> {{ car.num }}{{ 215 <span v-if="car.num > 0"> {{ car.num }}{{
216 language == 0 ? '辆' : 'Cars' 216 language == 0 ? '辆' : 'Cars'
217 }} * {{ language == 0 ? '¥' : '' }}{{ car.price }}</span> 217 }} * {{ language == 0 ? '¥' : '$' }}{{ car.price }}</span>
218 </div> 218 </div>
219 <div>{{ language == 0 ? '人数' : 'Counts' }}{{ form.dropOffBo.count }}</div> 219 <div>{{ language == 0 ? '人数' : 'Counts' }}{{ form.dropOffBo.count }}</div>
220 <div>{{ language == 0 ? '联系人' : 'Contact Person' }}{{ form.dropOffBo.contacts }}</div> 220 <div>{{ language == 0 ? '联系人' : 'Contact Person' }}{{ form.dropOffBo.contacts }}</div>
...@@ -312,14 +312,14 @@ ...@@ -312,14 +312,14 @@
312 </el-col> 312 </el-col>
313 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 313 <el-col :lg="8" :md="12" :sm="12" :xs="24">
314 <div v-if="language == 0 "> 314 <div v-if="language == 0 ">
315 {{ language == 0 ? '¥' : '' }} 315 {{ language == 0 ? '¥' : '$' }}
316 {{ 316 {{
317 !v.discount ? form.extJson?.ticketDate?.price : form.extJson?.ticketDate?.rebatePrice 317 !v.discount ? form.extJson?.ticketDate?.price : form.extJson?.ticketDate?.rebatePrice
318 }} 318 }}
319 /{{ language == 0 ? '张' : 'Tickets' }} 319 /{{ language == 0 ? '张' : 'Tickets' }}
320 </div> 320 </div>
321 <div v-else> 321 <div v-else>
322 {{ language == 0 ? '¥' : '' }} 322 {{ language == 0 ? '¥' : '$' }}
323 {{ 323 {{
324 !v.discount ? form.extJson?.ticketDate?.priceEn : form.extJson?.ticketDate?.rebatePriceEn 324 !v.discount ? form.extJson?.ticketDate?.priceEn : form.extJson?.ticketDate?.rebatePriceEn
325 }} 325 }}
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
340 </el-col> 340 </el-col>
341 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 341 <el-col :lg="8" :md="12" :sm="12" :xs="24">
342 {{ language == 0 ? '共计' : 'total' }}:{{ 342 {{ language == 0 ? '共计' : 'total' }}:{{
343 language == 0 ? '¥' : '' 343 language == 0 ? '¥' : '$'
344 }}{{ Number(totalFee).toFixed(2) }} 344 }}{{ Number(totalFee).toFixed(2) }}
345 </el-col> 345 </el-col>
346 </el-row> 346 </el-row>
...@@ -361,20 +361,20 @@ ...@@ -361,20 +361,20 @@
361 </el-col> 361 </el-col>
362 <el-col :lg="12" class="result"> 362 <el-col :lg="12" class="result">
363 <div v-if="form.viewStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }} 363 <div v-if="form.viewStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}
364 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 364 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
365 </div> 365 </div>
366 <div v-if="form.viewStatus=='1'||form.viewStatus=='5'" class="priceb"> 366 <div v-if="form.viewStatus=='1'||form.viewStatus=='5'" class="priceb">
367 {{ language == 0 ? '已支付金额' : 'Amount Due' }} 367 {{ language == 0 ? '已支付金额' : 'Amount Due' }}
368 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 368 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
369 </div> 369 </div>
370 <div v-if="form.viewStatus=='4'" class="priceb">{{ language == 0 ? '已退订' : 'Refunded' }} 370 <div v-if="form.viewStatus=='4'" class="priceb">{{ language == 0 ? '已退订' : 'Refunded' }}
371 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 371 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
372 </div> 372 </div>
373 <div v-if="form.viewStatus=='2'" class="priceb">{{ language == 0 ? '已取消' : 'Canceled' }} 373 <div v-if="form.viewStatus=='2'" class="priceb">{{ language == 0 ? '已取消' : 'Canceled' }}
374 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 374 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
375 </div> 375 </div>
376 <div v-if="form.viewStatus=='7'" class="priceb">{{ language == 0 ? '退款审核中' : 'Refund in review' }} 376 <div v-if="form.viewStatus=='7'" class="priceb">{{ language == 0 ? '退款审核中' : 'Refund in review' }}
377 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 377 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
378 </div> 378 </div>
379 </el-col> 379 </el-col>
380 <el-col :lg="24"> 380 <el-col :lg="24">
...@@ -534,7 +534,7 @@ ...@@ -534,7 +534,7 @@
534 <SuccessFilled/> 534 <SuccessFilled/>
535 </el-icon> 535 </el-icon>
536 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p> 536 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
537 <h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ totalFee || 0 }}</h3> 537 <h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ totalFee || 0 }}</h3>
538 </div> 538 </div>
539 </div> 539 </div>
540 </el-card> 540 </el-card>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 <span >{{ formInfo.remarks }} </span> 62 <span >{{ formInfo.remarks }} </span>
63 </el-col> 63 </el-col>
64 <el-col> 64 <el-col>
65 {{ language == 0 ?'套餐':'Package' }}{{ formInfo.mealName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.mealPrice:''+ formInfo.mealPriceEn}}</span> 65 {{ language == 0 ?'套餐':'Package' }}{{ formInfo.mealName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.mealPrice:'$'+ formInfo.mealPriceEn}}</span>
66 </el-col> 66 </el-col>
67 <el-col> 67 <el-col>
68 {{ language == 0 ?'套餐说明':'Package Description' }}{{ formInfo.introduction}} 68 {{ language == 0 ?'套餐说明':'Package Description' }}{{ formInfo.introduction}}
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 <span >{{ formInfo.remarks }} </span> 80 <span >{{ formInfo.remarks }} </span>
81 </el-col> 81 </el-col>
82 <el-col> 82 <el-col>
83 {{ language == 0 ?'套餐':'Package' }}{{ formInfo.photoName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.photoPrice:''+ formInfo.photoPriceEn}}</span> 83 {{ language == 0 ?'套餐':'Package' }}{{ formInfo.photoName }} <span style="margin-left: 40px">{{ language==0?'价格':'Price' }}</span><span class="price">{{language==0? '¥'+formInfo.photoPrice:'$'+ formInfo.photoPriceEn}}</span>
84 </el-col> 84 </el-col>
85 <el-col> 85 <el-col>
86 {{ language == 0 ?'套餐说明':'Package Description' }}{{ formInfo.introduction}} 86 {{ language == 0 ?'套餐说明':'Package Description' }}{{ formInfo.introduction}}
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 <el-tag>{{car.carColor}}</el-tag> 111 <el-tag>{{car.carColor}}</el-tag>
112 </div> 112 </div>
113 113
114 <span v-if="car.num > 0"> {{car.num}}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ?'¥':'' }}{{car.price}}</span> 114 <span v-if="car.num > 0"> {{car.num}}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ?'¥':'$' }}{{car.price}}</span>
115 </div> 115 </div>
116 116
117 <div>{{ language == 0 ?'人数':'People' }}{{form.pickUpBo.count}}</div> 117 <div>{{ language == 0 ?'人数':'People' }}{{form.pickUpBo.count}}</div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
134 <el-tag>{{car.carColor}}</el-tag> 134 <el-tag>{{car.carColor}}</el-tag>
135 </div> 135 </div>
136 136
137 <span v-if="car.num > 0"> {{car.num }}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ? '¥' : '' }}{{car.price}}</span> 137 <span v-if="car.num > 0"> {{car.num }}{{ language == 0 ?'辆':'Cars' }} * {{ language == 0 ? '¥' : '$' }}{{car.price}}</span>
138 </div> 138 </div>
139 <div>{{ language == 0 ?'人数':'Counts' }}{{ form.dropOffBo.count }}</div> 139 <div>{{ language == 0 ?'人数':'Counts' }}{{ form.dropOffBo.count }}</div>
140 <div>{{ language == 0 ?'联系人':'Contact Person' }}{{ form.dropOffBo.contacts }}</div> 140 <div>{{ language == 0 ?'联系人':'Contact Person' }}{{ form.dropOffBo.contacts }}</div>
...@@ -204,19 +204,19 @@ ...@@ -204,19 +204,19 @@
204 </el-col> 204 </el-col>
205 <el-col :lg="12" class="result"> 205 <el-col :lg="12" class="result">
206 <div class="priceb" v-if="form.viewStatus=='0'">{{ language == 0 ? '待支付金额' : 'Amount Due' }} 206 <div class="priceb" v-if="form.viewStatus=='0'">{{ language == 0 ? '待支付金额' : 'Amount Due' }}
207 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 207 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
208 </div> 208 </div>
209 <div class="priceb" v-if="form.viewStatus=='1'||form.viewStatus=='5'">{{ language == 0 ? '已支付金额' : 'Amount Due' }} 209 <div class="priceb" v-if="form.viewStatus=='1'||form.viewStatus=='5'">{{ language == 0 ? '已支付金额' : 'Amount Due' }}
210 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 210 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
211 </div> 211 </div>
212 <div class="priceb" v-if="form.viewStatus=='4'">{{ language == 0 ? '已退订' : 'Refunded' }} 212 <div class="priceb" v-if="form.viewStatus=='4'">{{ language == 0 ? '已退订' : 'Refunded' }}
213 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 213 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
214 </div> 214 </div>
215 <div class="priceb" v-if="form.viewStatus=='2'">{{ language == 0 ? '已取消' : 'Canceled' }} 215 <div class="priceb" v-if="form.viewStatus=='2'">{{ language == 0 ? '已取消' : 'Canceled' }}
216 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 216 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
217 </div> 217 </div>
218 <div class="priceb" v-if="form.viewStatus=='7'">{{ language == 0 ? '退款审核中' : 'Refund in review' }} 218 <div class="priceb" v-if="form.viewStatus=='7'">{{ language == 0 ? '退款审核中' : 'Refund in review' }}
219 <span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span> 219 <span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span>
220 </div> 220 </div>
221 </el-col> 221 </el-col>
222 </el-row> 222 </el-row>
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
319 <SuccessFilled/> 319 <SuccessFilled/>
320 </el-icon> 320 </el-icon>
321 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p> 321 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
322 <h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ totalFee || 0 }}</h3> 322 <h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ totalFee || 0 }}</h3>
323 </div> 323 </div>
324 </div> 324 </div>
325 </el-card> 325 </el-card>
......
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
47 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>--> 47 <!-- <div style="margin-bottom: 20px">预约时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">09:00~12:00</span> </div>-->
48 <div v-if="language==0" style="margin-bottom: 20px;">上门摄影 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div> 48 <div v-if="language==0" style="margin-bottom: 20px;">上门摄影 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{ formDatas.goHome==1?'是':'否' }}</span></div>
49 <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> 49 <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>
50 <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> 50 <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>
51 </div> 51 </div>
52 52
53 <div style="flex: 1"> 53 <div style="flex: 1">
54 <div style="margin-bottom: 20px">{{ language==0?'套餐说明':"Package description" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div> 54 <div style="margin-bottom: 20px">{{ language==0?'套餐说明':"Package description" }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span">{{formDatas.introduction}}</span></div>
55 <!-- <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>--> 55 <!-- <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>-->
56 </div> 56 </div>
57 </el-row> 57 </el-row>
58 </el-row> 58 </el-row>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
94 <el-row justify="space-between" align="middle"> 94 <el-row justify="space-between" align="middle">
95 <el-col :span="12"> 95 <el-col :span="12">
96 <label>{{ language == 0 ? '共计金额' : 'Total' }} 96 <label>{{ language == 0 ? '共计金额' : 'Total' }}
97 <span class=" text-warning"> {{ language == 0 ? '¥' : '' }}<span class="bigMoney">{{ 97 <span class=" text-warning"> {{ language == 0 ? '¥' : '$' }}<span class="bigMoney">{{
98 money 98 money
99 }}</span></span> 99 }}</span></span>
100 </label> 100 </label>
......
...@@ -25,21 +25,21 @@ ...@@ -25,21 +25,21 @@
25 <p>票档:{{ ticketForm.extJson?.ticketType?.name }}</p> 25 <p>票档:{{ ticketForm.extJson?.ticketType?.name }}</p>
26 <p>时间:{{ ticketForm.extJson?.ticketDate.name }}</p> 26 <p>时间:{{ ticketForm.extJson?.ticketDate.name }}</p>
27 <p>通票:{{ 27 <p>通票:{{
28 paymentType != 3 ? '¥' : '' 28 paymentType != 3 ? '¥' : '$'
29 }} 29 }}
30 {{ 30 {{
31 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn 31 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
32 }} 32 }}
33 /1张</p> 33 /1张</p>
34 <p>优惠票:{{ 34 <p>优惠票:{{
35 paymentType != 3 ? '¥' : '' 35 paymentType != 3 ? '¥' : '$'
36 }} 36 }}
37 {{ 37 {{
38 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn 38 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
39 }} 39 }}
40 /1张</p> 40 /1张</p>
41 41
42 <p class="poPrice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</p> 42 <p class="poPrice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</p>
43 </div> 43 </div>
44 <div> 44 <div>
45 <el-row v-for="v in message" style="width: 100%"> 45 <el-row v-for="v in message" style="width: 100%">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 {{ 55 {{
56 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn 56 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
57 }} 57 }}
58 {{ paymentType != 3 ? '¥' : '' }}/张 58 {{ paymentType != 3 ? '¥' : '$' }}/张
59 </el-col> 59 </el-col>
60 </el-row> 60 </el-row>
61 <el-row style="width: 100%"> 61 <el-row style="width: 100%">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 </el-col> 67 </el-col>
68 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 68 <el-col :lg="8" :md="12" :sm="12" :xs="24">
69 共计:{{ (totalMoney * 1).toFixed(2) }}{{ 69 共计:{{ (totalMoney * 1).toFixed(2) }}{{
70 paymentType != 3 ? '¥' : '' 70 paymentType != 3 ? '¥' : '$'
71 }} 71 }}
72 </el-col> 72 </el-col>
73 </el-row> 73 </el-row>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
81 <el-form ref="formRef" :label-width="paymentType != 3 ?'100':'150'" :model="form" :rules="rules" 81 <el-form ref="formRef" :label-width="paymentType != 3 ?'100':'150'" :model="form" :rules="rules"
82 class="mw500"> 82 class="mw500">
83 <el-form-item :label="language==0 ?'开票金额':'Amount'"> 83 <el-form-item :label="language==0 ?'开票金额':'Amount'">
84 <span class="bigprice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</span> 84 <span class="bigprice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</span>
85 </el-form-item> 85 </el-form-item>
86 86
87 <el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required> 87 <el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
......
...@@ -125,13 +125,13 @@ ...@@ -125,13 +125,13 @@
125 {{ languageFormat(language, "共计", "Total") }} 125 {{ languageFormat(language, "共计", "Total") }}
126 </div> 126 </div>
127 <div class="price_num"> 127 <div class="price_num">
128 <span>{{ language == 0 ? "¥" : "" }}</span> 128 <span>{{ language == 0 ? "¥" : "$" }}</span>
129 {{ 129 {{
130 language == 0 ? (price.total_cn * 1).toFixed(2) : (price.total_en * 1).toFixed(2) 130 language == 0 ? (price.total_cn * 1).toFixed(2) : (price.total_en * 1).toFixed(2)
131 }} 131 }}
132 132
133 <span v-if="tickType.isCountSale==1&&orderForm.message.length>=tickType.counts" class="total"> 133 <span v-if="tickType.isCountSale==1&&orderForm.message.length>=tickType.counts" class="total">
134 {{ language == 0 ? "¥" : "" }} 134 {{ language == 0 ? "¥" : "$" }}
135 {{ 135 {{
136 language == 0 ? (price.total_cnY * 1).toFixed(2) : (price.total_enY * 1).toFixed(2) 136 language == 0 ? (price.total_cnY * 1).toFixed(2) : (price.total_enY * 1).toFixed(2)
137 }} 137 }}
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
148 {{ languageFormat(language, "共计金额", "Subtotal") }} 148 {{ languageFormat(language, "共计金额", "Subtotal") }}
149 </span> 149 </span>
150 <span class="value"> 150 <span class="value">
151 <span>{{ language == 0 ? "¥" : "" }}</span> 151 <span>{{ language == 0 ? "¥" : "$" }}</span>
152 {{ language == 0 ? (price.total_cn * 1).toFixed(2) : (price.total_en * 1).toFixed(2) }} 152 {{ language == 0 ? (price.total_cn * 1).toFixed(2) : (price.total_en * 1).toFixed(2) }}
153 </span> 153 </span>
154 </div> 154 </div>
......
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
123 <div class="select_item_box"> 123 <div class="select_item_box">
124 <div class="select_item"> 124 <div class="select_item">
125 <div class="tagActive" style="min-width: 80px"> 125 <div class="tagActive" style="min-width: 80px">
126 {{ language == 0 ? '¥' : '' }} {{ language == 0 ? selectForm.price : selectForm.priceEn }} 126 {{ language == 0 ? '¥' : '$' }} {{ language == 0 ? selectForm.price : selectForm.priceEn }}
127 </div> 127 </div>
128 </div> 128 </div>
129 </div> 129 </div>
......
...@@ -24,17 +24,17 @@ ...@@ -24,17 +24,17 @@
24 <p>地址:{{ matchForm.address }}</p> 24 <p>地址:{{ matchForm.address }}</p>
25 <p>票档:{{ ticketForm.extJson?.ticketType?.name }}</p> 25 <p>票档:{{ ticketForm.extJson?.ticketType?.name }}</p>
26 <p>时间:{{ ticketForm.extJson?.ticketDate.name }}</p> 26 <p>时间:{{ ticketForm.extJson?.ticketDate.name }}</p>
27 <p>通票:{{ paymentType != 3 ? '¥' : '' }} 27 <p>通票:{{ paymentType != 3 ? '¥' : '$' }}
28 {{ 28 {{
29 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn 29 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
30 }} 30 }}
31 /1张</p> 31 /1张</p>
32 <p>优惠票:{{ paymentType != 3 ? '¥' : '' }} 32 <p>优惠票:{{ paymentType != 3 ? '¥' : '$' }}
33 {{ 33 {{
34 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn 34 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
35 }} 35 }}
36 /1张</p> 36 /1张</p>
37 <p class="poPrice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</p> 37 <p class="poPrice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</p>
38 </div> 38 </div>
39 <div> 39 <div>
40 <el-row v-for="v in message" style="width: 100%"> 40 <el-row v-for="v in message" style="width: 100%">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 {{ 50 {{
51 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn 51 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
52 }} 52 }}
53 {{ paymentType != 3 ? '¥' : '' }}/张 53 {{ paymentType != 3 ? '¥' : '$' }}/张
54 </el-col> 54 </el-col>
55 </el-row> 55 </el-row>
56 <el-row style="width: 100%"> 56 <el-row style="width: 100%">
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </el-col> 66 </el-col>
67 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 67 <el-col :lg="8" :md="12" :sm="12" :xs="24">
68 共计:{{ (totalMoney * 1).toFixed(2) }}{{ 68 共计:{{ (totalMoney * 1).toFixed(2) }}{{
69 paymentType != 3 ? '¥' : '' 69 paymentType != 3 ? '¥' : '$'
70 }} 70 }}
71 </el-col> 71 </el-col>
72 </el-row> 72 </el-row>
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 <el-form ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules" 77 <el-form ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
78 class="mw500"> 78 class="mw500">
79 <el-form-item :label="'开票金额'"> 79 <el-form-item :label="'开票金额'">
80 <span class="bigprice">{{ paymentType != 3 ? '¥' : '' }}{{ totalMoney }}</span> 80 <span class="bigprice">{{ paymentType != 3 ? '¥' : '$' }}{{ totalMoney }}</span>
81 </el-form-item> 81 </el-form-item>
82 82
83 <el-form-item :label="`发票形式`" prop="invoiceForm" required> 83 <el-form-item :label="`发票形式`" prop="invoiceForm" required>
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
23 <div class="customer"> 23 <div class="customer">
24 <div class="name">{{ n.name }} 24 <div class="name">{{ n.name }}
25 <span class="fr fwb text-warning" v-if="language==0&&n.discount == 0"> ¥{{n.price}} </span> 25 <span class="fr fwb text-warning" v-if="language==0&&n.discount == 0"> ¥{{n.price}} </span>
26 <span class="fr fwb text-warning" v-if="language==1&&n.discount == 0"> {{n.priceEn}} </span> 26 <span class="fr fwb text-warning" v-if="language==1&&n.discount == 0"> ${{n.priceEn}} </span>
27 <span class="fr fwb text-warning" v-if="language==0&&n.discount == 1"> ¥{{n.rebatePrice}} </span> 27 <span class="fr fwb text-warning" v-if="language==0&&n.discount == 1"> ¥{{n.rebatePrice}} </span>
28 <span class="fr fwb text-warning" v-if="language==1&&n.discount == 1"> {{n.rebatePriceEn}} </span> 28 <span class="fr fwb text-warning" v-if="language==1&&n.discount == 1"> ${{n.rebatePriceEn}} </span>
29 </div> 29 </div>
30 <p> 30 <p>
31 <label v-if="n.idcType == 0">{{ language==0?'身份证':'ID Card' }}</label> 31 <label v-if="n.idcType == 0">{{ language==0?'身份证':'ID Card' }}</label>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 </p> 51 </p>
52 </el-col> 52 </el-col>
53 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 53 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
54 <span class="text-warning"> {{ b.paymentType == '3' ? '' : '¥' }} 54 <span class="text-warning"> {{ b.paymentType == '3' ? '$' : '¥' }}
55 <span class="bigMoney">{{ b.totalStr }}</span> 55 <span class="bigMoney">{{ b.totalStr }}</span>
56 </span> 56 </span>
57 </el-col> 57 </el-col>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
87 </div> 87 </div>
88 </el-col> 88 </el-col>
89 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 89 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
90 <span class="text-warning"> {{ b.payType != '2' || !b.totalPayAmount ? '¥' : '' }} 90 <span class="text-warning"> {{ b.payType != '2' || !b.totalPayAmount ? '¥' : '$' }}
91 <span class="bigMoney">{{ b.totalPayAmount || b.totalAmount }}</span> 91 <span class="bigMoney">{{ b.totalPayAmount || b.totalAmount }}</span>
92 </span> 92 </span>
93 </el-col> 93 </el-col>
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
162 </div> 162 </div>
163 </el-col> 163 </el-col>
164 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 164 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
165 <span class="text-warning"> {{ b.paymentType == 3 ? '' : '¥' }} 165 <span class="text-warning"> {{ b.paymentType == 3 ? '$' : '¥' }}
166 <span class="bigMoney">{{ b.totalStr }}</span> 166 <span class="bigMoney">{{ b.totalStr }}</span>
167 </span> 167 </span>
168 </el-col> 168 </el-col>
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
109 </div> 109 </div>
110 </el-col> 110 </el-col>
111 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 111 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
112 <span class="text-warning"> {{ language == 0 ? '¥' : '' }} 112 <span class="text-warning"> {{ language == 0 ? '¥' : '$' }}
113 <span class="bigMoney">{{ language == 0 ? b.total : b.totalEn }}</span> 113 <span class="bigMoney">{{ language == 0 ? b.total : b.totalEn }}</span>
114 </span> 114 </span>
115 </el-col> 115 </el-col>
......
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
11 <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">接送服务</div> 11 <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">接送服务</div>
12 </el-col> 12 </el-col>
13 <el-col :sm="12" :lg="4" :xs="12"> 13 <el-col :sm="12" :lg="4" :xs="12">
14 <div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">场地介绍</div> 14 <div class="item" @click="popRemark(10)"><img src="@/assets/dance/btn04.png">票务服务</div>
15 </el-col> 15 </el-col>
16 <el-col :sm="12" :lg="4" :xs="12"> 16 <el-col :sm="12" :lg="4" :xs="12">
17 <div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">媒体注册</div> 17 <div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">媒体注册</div>
18 </el-col> 18 </el-col>
19 <el-col :sm="12" :lg="4" :xs="12"> 19 <!-- <el-col :sm="12" :lg="4" :xs="12">-->
20 <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">周边活动</div> 20 <!-- <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">周边活动</div>-->
21 </el-col> 21 <!-- </el-col>-->
22 <!-- <el-col :sm="12" :lg="4" :xs="12">--> 22 <!-- <el-col :sm="12" :lg="4" :xs="12">-->
23 <!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>--> 23 <!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>-->
24 <!-- </el-col>--> 24 <!-- </el-col>-->
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
36 <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">TRANSPORTATION RESERVATION</div> 36 <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">TRANSPORTATION RESERVATION</div>
37 </el-col> 37 </el-col>
38 <el-col :sm="12" :lg="4" :xs="12"> 38 <el-col :sm="12" :lg="4" :xs="12">
39 <div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">Venue Introduction</div> 39 <div class="item" @click="popRemark(10)"><img src="@/assets/dance/btn04.png">TICKET SERVICES</div>
40 </el-col> 40 </el-col>
41 <el-col :sm="12" :lg="4" :xs="12"> 41 <el-col :sm="12" :lg="4" :xs="12">
42 <div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">Media Registration</div> 42 <div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">Media Registration</div>
43 </el-col> 43 </el-col>
44 <el-col :sm="12" :lg="4" :xs="12"> 44 <!-- <el-col :sm="12" :lg="4" :xs="12">-->
45 <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">Around Activity</div> 45 <!-- <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">Around Activity</div>-->
46 </el-col> 46 <!-- </el-col>-->
47 47
48 <!-- <el-col :sm="12" :lg="4" :xs="12">--> 48 <!-- <el-col :sm="12" :lg="4" :xs="12">-->
49 <!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">live streaming</div>--> 49 <!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">live streaming</div>-->
...@@ -167,6 +167,7 @@ function popRemark(type) { ...@@ -167,6 +167,7 @@ function popRemark(type) {
167 || (form.value.isFoodView == 0 && type == '3') 167 || (form.value.isFoodView == 0 && type == '3')
168 || (form.value.isMealView == 0 && type == '4') 168 || (form.value.isMealView == 0 && type == '4')
169 || (form.value.isPhotoView == 0 && type == '5') 169 || (form.value.isPhotoView == 0 && type == '5')
170 || (form.value.isTicketView == 0 && type == '10')
170 ) { 171 ) {
171 building() 172 building()
172 return 173 return
...@@ -182,13 +183,14 @@ function popRemark(type) { ...@@ -182,13 +183,14 @@ function popRemark(type) {
182 183
183 function goBooking(n) { 184 function goBooking(n) {
184 switch (n) { 185 switch (n) {
185 case 0: 186 case 10:
186 // 票务 187 // 票务
187 router.push({ 188
188 path: `/booking/ticket/${props.matchId}`, 189 // router.push({
190 // path: `/booking/ticket/${props.matchId}`,
189 // params: {id:props.matchId}, 191 // params: {id:props.matchId},
190 // query: {id: props.matchId} 192 // query: {id: props.matchId}
191 }) 193 // })
192 break; 194 break;
193 case 1: 195 case 1:
194 //酒店 196 //酒店
...@@ -220,7 +222,8 @@ function goBooking(n) { ...@@ -220,7 +222,8 @@ function goBooking(n) {
220 //border-radius: 20px; 222 //border-radius: 20px;
221 } 223 }
222 224
223 225 :deep(.el-col){ max-width: 20%;
226 flex: 0 0 20%;}
224 .item { 227 .item {
225 box-shadow: 0px 0px 21px 0px rgba(41, 23, 101, 0.14); 228 box-shadow: 0px 0px 21px 0px rgba(41, 23, 101, 0.14);
226 margin: 10px 0; 229 margin: 10px 0;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <div v-if="type==3" class="plr20" v-html="form.reserveDesFood"></div> 8 <div v-if="type==3" class="plr20" v-html="form.reserveDesFood"></div>
9 <div v-if="type==4" class="plr20" v-html="form.reserveDesMeal"></div> 9 <div v-if="type==4" class="plr20" v-html="form.reserveDesMeal"></div>
10 <div v-if="type==5" class="plr20" v-html="form.reserveDesPhoto"></div> 10 <div v-if="type==5" class="plr20" v-html="form.reserveDesPhoto"></div>
11 <div v-if="type==0" class="plr20" v-html="form.reserveDesTitck"></div> 11 <div v-if="type==10" class="plr20" v-html="form.reserveDesTitck"></div>
12 </div> 12 </div>
13 <template #footer> 13 <template #footer>
14 <div class="dialog-footer text-center"> 14 <div class="dialog-footer text-center">
......
...@@ -503,6 +503,16 @@ const gopicliveUrl = () => { ...@@ -503,6 +503,16 @@ const gopicliveUrl = () => {
503 ElMessage.warning( 'No live' ) 503 ElMessage.warning( 'No live' )
504 } 504 }
505 } 505 }
506
507 const goDetail = (n) => {
508 if (n.isOut === '1') {
509 window.open(n.jumpUrl)
510 } else {
511 router.push({
512 path: `/news/detail/${n.noteId}`
513 })
514 }
515 }
506 </script> 516 </script>
507 517
508 <style scoped lang="scss"> 518 <style scoped lang="scss">
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 {{ c.code }}:{{ c.name }} {{c.danceType}} 66 {{ c.code }}:{{ c.name }} {{c.danceType}}
67 <div>{{ c.danceTypeDetailStr }}</div> 67 <div>{{ c.danceTypeDetailStr }}</div>
68 </div> 68 </div>
69 <div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div> 69 <div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
70 </div> 70 </div>
71 </el-checkbox> 71 </el-checkbox>
72 </el-checkbox-group> 72 </el-checkbox-group>
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 {{ c.code }}:{{ c.name }} 92 {{ c.code }}:{{ c.name }}
93 <div>{{ c.danceTypeDetailStr }}</div> 93 <div>{{ c.danceTypeDetailStr }}</div>
94 </div> 94 </div>
95 <div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div> 95 <div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
96 </div> 96 </div>
97 </el-checkbox> 97 </el-checkbox>
98 </el-checkbox-group> 98 </el-checkbox-group>
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
105 <div v-if="c.danceType=='Breaking'">--</div> 105 <div v-if="c.danceType=='Breaking'">--</div>
106 <div v-else>{{c.danceTypeDetailStr}}</div> 106 <div v-else>{{c.danceTypeDetailStr}}</div>
107 </div> 107 </div>
108 <div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div> 108 <div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
109 </div> 109 </div>
110 </el-checkbox> 110 </el-checkbox>
111 </el-checkbox-group> 111 </el-checkbox-group>
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 {{ c.code }}:{{ c.name }} 86 {{ c.code }}:{{ c.name }}
87 <div>{{ c.danceTypeDetailStr }}</div> 87 <div>{{ c.danceTypeDetailStr }}</div>
88 </div> 88 </div>
89 <div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div> 89 <div class="text-primary">{{ language == 0 ? '¥' : '$' }}{{ c.serviceFee }}</div>
90 </div> 90 </div>
91 </el-checkbox> 91 </el-checkbox>
92 </el-checkbox-group> 92 </el-checkbox-group>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 </el-table-column> 60 </el-table-column>
61 <el-table-column :label="language==0?'服务费':'Registration Fee'" width="160" align="center"> 61 <el-table-column :label="language==0?'服务费':'Registration Fee'" width="160" align="center">
62 <template #default="scope"> 62 <template #default="scope">
63 <div class="text-primary">{{ language==0?'¥':'' }}{{ scope.row.serviceFee }}</div> 63 <div class="text-primary">{{ language==0?'¥':'$' }}{{ scope.row.serviceFee }}</div>
64 </template> 64 </template>
65 </el-table-column> 65 </el-table-column>
66 </el-table> 66 </el-table>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 </el-table-column> 54 </el-table-column>
55 <el-table-column :fixed="hasAction?false:'right'" min-width="100" align="center" :label="language==0?'保险费':'Premium'" prop="insuranceFee"> 55 <el-table-column :fixed="hasAction?false:'right'" min-width="100" align="center" :label="language==0?'保险费':'Premium'" prop="insuranceFee">
56 <template #default="scope"> 56 <template #default="scope">
57 <span class="text-primary">{{ language==0?'¥':'' }}{{ scope.row.insuranceFee }}</span> 57 <span class="text-primary">{{ language==0?'¥':'$' }}{{ scope.row.insuranceFee }}</span>
58 </template> 58 </template>
59 </el-table-column> 59 </el-table-column>
60 <!-- 补充信息--> 60 <!-- 补充信息-->
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 <div> 83 <div>
84 {{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span> 84 {{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span>
85 85
86 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span> 86 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'$' }}{{ total }}</span>
87 </div> 87 </div>
88 </div> 88 </div>
89 89
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop=""> 33 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop="">
34 <template #default="scope"> 34 <template #default="scope">
35 <div class="text-primary"> 35 <div class="text-primary">
36 {{ language==0?'¥':'' }}{{ scope.row.project.serviceFee }} 36 {{ language==0?'¥':'$' }}{{ scope.row.project.serviceFee }}
37 </div> 37 </div>
38 </template> 38 </template>
39 </el-table-column> 39 </el-table-column>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <div> 50 <div>
51 {{ language==0?'总报项数':'Count' }}: <span class="mr20">{{ list.length }}</span> 51 {{ language==0?'总报项数':'Count' }}: <span class="mr20">{{ list.length }}</span>
52 52
53 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span> 53 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'$' }}{{ total }}</span>
54 </div> 54 </div>
55 </div> 55 </div>
56 </template> 56 </template>
......
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
135 <td> 135 <td>
136 <span v-for="s in row.athletes">{{ s.name }},</span> 136 <span v-for="s in row.athletes">{{ s.name }},</span>
137 </td> 137 </td>
138 <td> {{ language == 0 ? '¥' : '' }}{{ row.project.serviceFee }}</td> 138 <td> {{ language == 0 ? '¥' : '$' }}{{ row.project.serviceFee }}</td>
139 </tr> 139 </tr>
140 </table> 140 </table>
141 </div> 141 </div>
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
204 <div> 204 <div>
205 {{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span> 205 {{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span>
206 206
207 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span> 207 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'$' }}{{ total }}</span>
208 </div> 208 </div>
209 </div> 209 </div>
210 </div> 210 </div>
......
...@@ -87,12 +87,12 @@ ...@@ -87,12 +87,12 @@
87 <div v-if="Number(form.totalFee)>0" class="flex"> 87 <div v-if="Number(form.totalFee)>0" class="flex">
88 <div v-if="signInfoList?.length>0" class="item"><label>{{ 88 <div v-if="signInfoList?.length>0" class="item"><label>{{
89 language == 0 ? '参赛服务费' : 'REGISTRATION FEE' 89 language == 0 ? '参赛服务费' : 'REGISTRATION FEE'
90 }}:</label><span>{{ language == 0 ? '¥' : '' }}{{ serviceFeeTotal }}</span></div> 90 }}:</label><span>{{ language == 0 ? '¥' : '$' }}{{ serviceFeeTotal }}</span></div>
91 <div v-if="zuTableList?.length>0" class="item"><label>{{ 91 <div v-if="zuTableList?.length>0" class="item"><label>{{
92 language == 0 ? '保险费' : 'INSURANCE' 92 language == 0 ? '保险费' : 'INSURANCE'
93 }}:</label><span>{{ language == 0 ? '¥' : '' }}{{ insuranceFeeTotal }}</span></div> 93 }}:</label><span>{{ language == 0 ? '¥' : '$' }}{{ insuranceFeeTotal }}</span></div>
94 <div class="item"><label>{{ language == 0 ? '费用总计' : 'Total Cost' }}:</label><span 94 <div class="item"><label>{{ language == 0 ? '费用总计' : 'Total Cost' }}:</label><span
95 class="size26">{{ language == 0 ? '¥' : '' }}{{ form.totalFee }}</span></div> 95 class="size26">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee }}</span></div>
96 </div> 96 </div>
97 </el-col> 97 </el-col>
98 </el-row> 98 </el-row>
...@@ -133,16 +133,16 @@ ...@@ -133,16 +133,16 @@
133 </el-col> 133 </el-col>
134 <el-col v-if="Number(form.totalFee)>0" :lg="12"> 134 <el-col v-if="Number(form.totalFee)>0" :lg="12">
135 <div v-if="form.payStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}:<span 135 <div v-if="form.payStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}:<span
136 class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div> 136 class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
137 <div v-else-if="form.payStatus=='1'" class="priceb">{{ 137 <div v-else-if="form.payStatus=='1'" class="priceb">{{
138 language == 0 ? '线下支付待核销' : 'Amount Due' 138 language == 0 ? '线下支付待核销' : 'Amount Due'
139 }}:<span class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div> 139 }}:<span class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
140 <div v-else-if="form.payStatus=='3'" class="priceb">{{ language == 0 ? '已支付金额' : 'Amount Due' }}:<span 140 <div v-else-if="form.payStatus=='3'" class="priceb">{{ language == 0 ? '已支付金额' : 'Amount Due' }}:<span
141 class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div> 141 class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
142 <div v-else-if="form.payStatus=='5'" class="priceb">{{ language == 0 ? '已退款' : 'Refunded' }}:<span 142 <div v-else-if="form.payStatus=='5'" class="priceb">{{ language == 0 ? '已退款' : 'Refunded' }}:<span
143 class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div> 143 class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
144 <div v-else class="priceb">{{ language == 0 ? '费用总计' : 'Amount Due' }}:<span 144 <div v-else class="priceb">{{ language == 0 ? '费用总计' : 'Amount Due' }}:<span
145 class="price">{{ language == 0 ? '¥' : '' }}{{ Number(totalFee).toFixed(2) }}</span></div> 145 class="price">{{ language == 0 ? '¥' : '$' }}{{ Number(totalFee).toFixed(2) }}</span></div>
146 </el-col> 146 </el-col>
147 </el-row> 147 </el-row>
148 </el-card> 148 </el-card>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
260 <tr> 260 <tr>
261 <th>{{ language == 0 ? '付款金额' : 'Payment Amount' }}</th> 261 <th>{{ language == 0 ? '付款金额' : 'Payment Amount' }}</th>
262 <td> 262 <td>
263 {{ language == 0 ? '¥' : '' }}{{ totalFee }} 263 {{ language == 0 ? '¥' : '$' }}{{ totalFee }}
264 <div class="text-gray">{{ 264 <div class="text-gray">{{
265 language == 0 ? '请按照指定金额进行打款' : 'Please make the payment according to the specified amount' 265 language == 0 ? '请按照指定金额进行打款' : 'Please make the payment according to the specified amount'
266 }} 266 }}
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
335 <SuccessFilled/> 335 <SuccessFilled/>
336 </el-icon> 336 </el-icon>
337 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p> 337 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
338 <h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ form.totalFee || 0 }}</h3> 338 <h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee || 0 }}</h3>
339 339
340 <el-button v-if="language != 0" class="btn-lineG w200px" round type="primary" @click="downInvoice"> 340 <el-button v-if="language != 0" class="btn-lineG w200px" round type="primary" @click="downInvoice">
341 {{ language == 0 ? '下载收据' : 'DownLoad Invoice' }} 341 {{ language == 0 ? '下载收据' : 'DownLoad Invoice' }}
...@@ -350,7 +350,7 @@ ...@@ -350,7 +350,7 @@
350 <SuccessFilled/> 350 <SuccessFilled/>
351 </el-icon> 351 </el-icon>
352 <p class="text-success">{{ language == 0 ? '支付成功' : 'successfully!' }}</p> 352 <p class="text-success">{{ language == 0 ? '支付成功' : 'successfully!' }}</p>
353 <h3 class="wePrice">{{ language == 0 ? '¥' : '' }}{{ form.totalFee }}</h3> 353 <h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee }}</h3>
354 <span v-if="language==0" 354 <span v-if="language==0"
355 class="text-danger size12">*您可以在上传汇款单完成后,与联系人进行电话确认。具体缴费结果,可以在个人中心-我的报名中查看进度</span> 355 class="text-danger size12">*您可以在上传汇款单完成后,与联系人进行电话确认。具体缴费结果,可以在个人中心-我的报名中查看进度</span>
356 <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> 356 <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 @@ ...@@ -66,9 +66,9 @@
66 <el-row class="priceBar"> 66 <el-row class="priceBar">
67 <el-col :lg="12" :xs="24" class="pd20"> 67 <el-col :lg="12" :xs="24" class="pd20">
68 <div class="flex"> 68 <div class="flex">
69 <div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptRegistrationFee?.totalFee}}</span></div> 69 <div class="item" v-if="form.cptRegistrationFee?.totalFee>0"><label>{{ language==0?'参赛服务费':'REGISTRATION FEE' }}:</label><span>{{ language==0?'¥':'$' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
70 <div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptInsuranceFee?.totalFee}}</span></div> 70 <div class="item" v-if="form.cptInsuranceFee?.totalFee>0"><label>{{ language==0?'保险费':'INSURANCE' }}:</label><span>{{ language==0?'¥':'$' }}{{form.cptInsuranceFee?.totalFee}}</span></div>
71 <div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'' }}{{form.totalFee}}</span></div> 71 <div class="item" v-if="form.totalFee>0"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'$' }}{{form.totalFee}}</span></div>
72 </div> 72 </div>
73 </el-col> 73 </el-col>
74 <el-col :lg="12" :xs="24" class="text-right pd20"> 74 <el-col :lg="12" :xs="24" class="text-right pd20">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-col :lg="12" :sm="24" :md="12"> 10 <el-col :lg="12" :sm="24" :md="12">
11 <div class="liveImgbox" @click="goDetail(newsList[0])"> 11 <div class="liveImgbox" @click="goDetail(newsList[0])">
12 <!-- <i class="ii">直播中</i>--> 12 <!-- <i class="ii">直播中</i>-->
13 <img :src="fillImgUrl_webSite(newsList[0]?.picUrl)"> 13 <el-image :src="fillImgUrl_webSite(newsList[0]?.picUrl)"/>
14 <h3 class="esp">{{ newsList[0]?.name }} 14 <h3 class="esp">{{ newsList[0]?.name }}
15 </h3> 15 </h3>
16 </div> 16 </div>
...@@ -19,27 +19,26 @@ ...@@ -19,27 +19,26 @@
19 <el-row :gutter="20"> 19 <el-row :gutter="20">
20 <el-col :md="12" :lg="12"> 20 <el-col :md="12" :lg="12">
21 <div class="videoImgbox" @click="goDetail(newsList[1])"> 21 <div class="videoImgbox" @click="goDetail(newsList[1])">
22 <img :src="fillImgUrl_webSite(newsList[1]?.picUrl)"> 22 <el-image :src="fillImgUrl_webSite(newsList[1]?.picUrl)"/>
23 </div> 23 </div>
24 </el-col> 24 </el-col>
25 <el-col :md="12" :lg="12"> 25 <el-col :md="12" :lg="12">
26 <div class="videoImgbox" @click="goDetail(newsList[2])"> 26 <div class="videoImgbox" @click="goDetail(newsList[2])">
27 <img :src="fillImgUrl_webSite(newsList[2]?.picUrl)"> 27 <el-image :src="fillImgUrl_webSite(newsList[2]?.picUrl)"/>
28 </div> 28 </div>
29 </el-col> 29 </el-col>
30 <el-col :md="12" :lg="12" class="mt20"> 30 <el-col :md="12" :lg="12" class="mt20">
31 <div class="videoImgbox" @click="goDetail(newsList[3])"> 31 <div class="videoImgbox" @click="goDetail(newsList[3])">
32 <img :src="fillImgUrl_webSite(newsList[3]?.picUrl)"> 32 <el-image :src="fillImgUrl_webSite(newsList[3]?.picUrl)"/>
33 </div> 33 </div>
34 </el-col> 34 </el-col>
35 <el-col :md="12" :lg="12" class="mt20"> 35 <el-col :md="12" :lg="12" class="mt20">
36 <div class="videoImgbox" @click="goDetail(newsList[4])"> 36 <div class="videoImgbox" @click="goDetail(newsList[4])">
37 <img :src="fillImgUrl_webSite(newsList[4]?.picUrl)"> 37 <el-image :src="fillImgUrl_webSite(newsList[4]?.picUrl)"/>
38 </div> 38 </div>
39 </el-col> 39 </el-col>
40 </el-row> 40 </el-row>
41 </el-col> 41 </el-col>
42
43 </el-row> 42 </el-row>
44 43
45 44
...@@ -47,7 +46,7 @@ ...@@ -47,7 +46,7 @@
47 <h3 class="leftboderTT">{{ language==0?'精彩图片':'PHOTOS' }}</h3> 46 <h3 class="leftboderTT">{{ language==0?'精彩图片':'PHOTOS' }}</h3>
48 <a class="more" @click="goList(query2.sortId,language==0?'精彩图片':'PHOTOS')">MORE</a> 47 <a class="more" @click="goList(query2.sortId,language==0?'精彩图片':'PHOTOS')">MORE</a>
49 </div> 48 </div>
50 <el-row class="mb20" :gutter="20"> 49 <el-row class="mb20" :gutter="20" v-loading="loading">
51 <el-col :lg="9"> 50 <el-col :lg="9">
52 <div class="picbox" @click="goDetail(newsList2[0])"><img :src="fillImgUrl_webSite(newsList2[0]?.picUrl)"/></div> 51 <div class="picbox" @click="goDetail(newsList2[0])"><img :src="fillImgUrl_webSite(newsList2[0]?.picUrl)"/></div>
53 </el-col> 52 </el-col>
...@@ -88,6 +87,7 @@ const total = ref(0) ...@@ -88,6 +87,7 @@ const total = ref(0)
88 const list = ref([]) 87 const list = ref([])
89 const newsList = ref([]) 88 const newsList = ref([])
90 const newsList2 = ref([]) 89 const newsList2 = ref([])
90 const loading = ref(true)
91 const query1 = ref({ 91 const query1 = ref({
92 pageSize: 5, 92 pageSize: 5,
93 pageNum: 1, 93 pageNum: 1,
...@@ -110,6 +110,7 @@ const getList = (obj) => { ...@@ -110,6 +110,7 @@ const getList = (obj) => {
110 } 110 }
111 getNewsListById(obj).then(res => { 111 getNewsListById(obj).then(res => {
112 newsList.value = res.rows 112 newsList.value = res.rows
113 loading.value = false
113 }) 114 })
114 } 115 }
115 const getList2 = (obj) => { 116 const getList2 = (obj) => {
...@@ -118,6 +119,7 @@ const getList2 = (obj) => { ...@@ -118,6 +119,7 @@ const getList2 = (obj) => {
118 } 119 }
119 getNewsListById(obj).then(res => { 120 getNewsListById(obj).then(res => {
120 newsList2.value = res.rows 121 newsList2.value = res.rows
122 loading.value = false
121 }) 123 })
122 } 124 }
123 125
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
3 width="480" :append-to-body="true" destroy-on-close @close="close" center> 3 width="480" :append-to-body="true" destroy-on-close @close="close" center>
4 <div> 4 <div>
5 <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"> 5 <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">
6 <div style="display: flex;gap: 20px;"> 6 <!-- <div style="display: flex;gap: 20px;">-->
7 <el-form-item :label="language==0?'姓':'Last Name'" required style="width: 100%;"> 7 <el-form-item :label="language==0?'姓':'Last Name'" required style="width: 100%;">
8 <el-input type="text" v-model="form.lastName" :placeholder="language==0?'请输入您的姓':'Please enter your last name'"/> 8 <el-input type="text" v-model="form.lastName" :placeholder="language==0?'请输入您的姓':'Please enter your last name'"/>
9 </el-form-item> 9 </el-form-item>
10 <el-form-item :label="language==0?'名':'First Name'" required style="width: 100%;"> 10 <el-form-item :label="language==0?'名':'First Name'" required style="width: 100%;">
11 <el-input type="text" v-model="form.firstName" :placeholder="language==0?'请输入您的名':'Please enter your first name'"/> 11 <el-input type="text" v-model="form.firstName" :placeholder="language==0?'请输入您的名':'Please enter your first name'"/>
12 </el-form-item> 12 </el-form-item>
13 </div> 13 <!-- </div>-->
14 <el-form-item :label="language==0?'邮箱':'E-mail'" required> 14 <el-form-item :label="language==0?'邮箱':'E-mail'" required>
15 <el-input type="text" v-model="form.account" @change="resetCode" @blur="verifyCode" 15 <el-input type="text" v-model="form.account" @change="resetCode" @blur="verifyCode"
16 /> 16 />
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
111 {{ languageFormat(language, "共计", "Total") }} 111 {{ languageFormat(language, "共计", "Total") }}
112 </div> 112 </div>
113 <div class="price_num"> 113 <div class="price_num">
114 <span>{{ language == 0 ? "¥" : "" }}</span> 114 <span>{{ language == 0 ? "¥" : "$" }}</span>
115 {{ order.data?.paymentAmount }} 115 {{ order.data?.paymentAmount }}
116 </div> 116 </div>
117 </div> 117 </div>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
125 {{ languageFormat(language, "共计金额", "Subtotal") }} 125 {{ languageFormat(language, "共计金额", "Subtotal") }}
126 </span> 126 </span>
127 <span class="value"> 127 <span class="value">
128 <span>{{ language == 0 ? "¥" : "" }}</span> 128 <span>{{ language == 0 ? "¥" : "$" }}</span>
129 {{ order.data?.paymentAmount }} 129 {{ order.data?.paymentAmount }}
130 </span> 130 </span>
131 </div> 131 </div>
......
...@@ -326,14 +326,14 @@ const showSJ = () => { ...@@ -326,14 +326,14 @@ const showSJ = () => {
326 <div style="width: 33%" class="td">{{ detail.data?.name }}</div> 326 <div style="width: 33%" class="td">{{ detail.data?.name }}</div>
327 <div style="width: 25%" class="td">{{ detail.data?.placeName }}</div> 327 <div style="width: 25%" class="td">{{ detail.data?.placeName }}</div>
328 <div style="width: 20%" class="td"> 328 <div style="width: 20%" class="td">
329 <span>{{ detail.data?.language == 'zh-cn' ? "¥" : "" }}</span> 329 <span>{{ detail.data?.language == 'zh-cn' ? "¥" : "$" }}</span>
330 {{ detail.data?.singlePrice }} 330 {{ detail.data?.singlePrice }}
331 </div> 331 </div>
332 <div style="width: 10%" class="td"> 332 <div style="width: 10%" class="td">
333 x{{ detail.data?.seatList?.length }} 333 x{{ detail.data?.seatList?.length }}
334 </div> 334 </div>
335 <div style="width: 12%; text-align: right" class="td"> 335 <div style="width: 12%; text-align: right" class="td">
336 <span>{{ detail.data?.language == 'zh-cn' ? "¥" : "" }}</span> 336 <span>{{ detail.data?.language == 'zh-cn' ? "¥" : "$" }}</span>
337 {{ detail.data?.payAmount }} 337 {{ detail.data?.payAmount }}
338 </div> 338 </div>
339 </div> 339 </div>
...@@ -454,7 +454,7 @@ const showSJ = () => { ...@@ -454,7 +454,7 @@ const showSJ = () => {
454 class="value" 454 class="value"
455 :style="{ color: status[detail.data?.state]?.color }" 455 :style="{ color: status[detail.data?.state]?.color }"
456 > 456 >
457 <span>{{ detail.data?.language == 'zh-cn' ? "¥" : "" }}</span> 457 <span>{{ detail.data?.language == 'zh-cn' ? "¥" : "$" }}</span>
458 {{ detail.data?.payAmount }} 458 {{ detail.data?.payAmount }}
459 </div> 459 </div>
460 </div> 460 </div>
......
...@@ -235,7 +235,7 @@ onMounted(() => { ...@@ -235,7 +235,7 @@ onMounted(() => {
235 }}{{ languageFormat(language, "张", "tickets") }} 235 }}{{ languageFormat(language, "张", "tickets") }}
236 </div> 236 </div>
237 <div class="common"> 237 <div class="common">
238 {{ languageFormat(language, "金额", "Ticket Price") }}{{it.payType=='2'?'':'¥'}}{{ it.payAmount }} 238 {{ languageFormat(language, "金额", "Ticket Price") }}{{it.payType=='2'?'$':'¥'}}{{ it.payAmount }}
239 </div> 239 </div>
240 <div class="status"> 240 <div class="status">
241 <div class="label"> 241 <div class="label">
......
...@@ -321,7 +321,7 @@ price.fetchData(); ...@@ -321,7 +321,7 @@ price.fetchData();
321 <img class="seat" :src="it.unSelectIcon" /> 321 <img class="seat" :src="it.unSelectIcon" />
322 <span class="price"> 322 <span class="price">
323 {{ it.price }} 323 {{ it.price }}
324 <span>{{ language == 0 ? "¥" : "" }}</span> 324 <span>{{ language == 0 ? "¥" : "$" }}</span>
325 </span> 325 </span>
326 </div> 326 </div>
327 </div> 327 </div>
...@@ -349,7 +349,7 @@ price.fetchData(); ...@@ -349,7 +349,7 @@ price.fetchData();
349 </div> 349 </div>
350 <div class="pay"> 350 <div class="pay">
351 <div class="sum"> 351 <div class="sum">
352 <span>{{ language == 0 ? "¥" : "" }}</span> 352 <span>{{ language == 0 ? "¥" : "$" }}</span>
353 {{ sumPrice?.toFixed(2) }} 353 {{ sumPrice?.toFixed(2) }}
354 </div> 354 </div>
355 <div class="pay_btn" @click="toConfirmOrder()"> 355 <div class="pay_btn" @click="toConfirmOrder()">
......
...@@ -389,7 +389,7 @@ watch( ...@@ -389,7 +389,7 @@ watch(
389 ]" 389 ]"
390 @click="select_form.onClickPrice(it)" 390 @click="select_form.onClickPrice(it)"
391 > 391 >
392 <span v-if="language == 1"></span> 392 <span v-if="language == 1">$</span>
393 {{ it.price }} 393 {{ it.price }}
394 <span v-if="language == 0"></span> 394 <span v-if="language == 0"></span>
395 </div> 395 </div>
......
...@@ -76,14 +76,14 @@ export default defineConfig(({ mode, command }) => { ...@@ -76,14 +76,14 @@ export default defineConfig(({ mode, command }) => {
76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
77 }, 77 },
78 '/dev-api/ztx-webSite': { 78 '/dev-api/ztx-webSite': {
79 target: 'http://192.168.1.118:8082/', 79 target: 'https://ces.2025wtcwuxi.com/stage-api/',
80 changeOrigin: true, 80 changeOrigin: true,
81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
82 }, 82 },
83 '/dev-api': { 83 '/dev-api': {
84 target: 'http://192.168.1.118:8082/', 84 // target: 'http://192.168.1.118:8082/',
85 // target: 'http://192.168.1.131:8081/', 85 // target: 'http://192.168.1.131:8081/',
86 // target: 'https://www.2025wtcwuxi.com/stage-api/', 86 target: 'https://ces.2025wtcwuxi.com/stage-api/',
87 // target: 'http://124.70.181.90:1880/stage-api', 87 // target: 'http://124.70.181.90:1880/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/', 88 // target: 'https://wdsfwuxicenter.com/stage-api/',
89 changeOrigin: true, 89 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!