Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
f0956aae by zhangmeng
Options

票务

1 parent cf19c717
Inline Side-by-side
Showing 3 changed files with 62 additions and 47 deletions
src/viewsPc/booking/ticket/index.vue
...@@ -793,7 +793,7 @@ getmatchData() ...@@ -793,7 +793,7 @@ getmatchData()
793 } 793 }
794 794
795 .remarks { 795 .remarks {
796 font-size: 17px; 796 font-size: 14px;
797 margin-left: 20px; 797 margin-left: 20px;
798 line-height: 40px; 798 line-height: 40px;
799 color: #2b2f3a; 799 color: #2b2f3a;
......
src/viewsPc/booking/travelDetail.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 <div class="title">{{ travel.name }}</div> 7 <div class="title">{{ travel.name }}</div>
8 <div class="select_item_box"> 8 <div class="select_item_box">
9 <div class="label"> 9 <div class="label">
10 {{ triggerLanguage(language, "时间", "Event Date & Time") }} : 10 {{ triggerLanguage(language, "日期", "Event Date & Time") }} :
11 </div> 11 </div>
12 </div> 12 </div>
13 <div class="select_item_box"> 13 <div class="select_item_box">
...@@ -28,49 +28,45 @@ ...@@ -28,49 +28,45 @@
28 <div> 28 <div>
29 <!-- 成人票 --> 29 <!-- 成人票 -->
30 <br> 30 <br>
31 <div v-for="v in ticketList" v-show="v.leftNum!=0" :key="v.id"> 31 <div style="min-height: 310px;">
32 <div class="select_item_box"> 32 <div v-for="v in ticketList" v-show="v.leftNum!=0&&v.show" :key="v.id">
33 <div class="ticket ticket-row"> 33 <div class="select_item_box">
34 <span class="label"> 34 <div class="ticket ticket-row">
35 {{ v.name }} : 35 <span class="label">
36 </span> 36 {{ v.name }} :
37 <span class="titleTick"> 37 </span>
38 {{ 38 </div>
39 triggerLanguage(language, v.price, v.priceEn) 39 <div class="rowBox">
40 }} 40 <span>
41 {{ 41 <el-input-number
42 triggerLanguage(language, '￥/人', '€/person') 42 v-model="v.count" :max="v.leftNum" :min="0" :precision="0" class="inputNumber"
43 }} 43 @change="countTotal"
44 </span> 44 />
45 </div> 45 <i class="residue">{{ language == 0 ? '剩余票数' : 'Remaining votes' }}{{ v.leftNum }}</i>
46 <div class="rowBox"> 46 </span>
47 47 <span class="titleTick">
48 <span> 48 {{
49 <el-input-number 49 triggerLanguage(language, v.price, v.priceEn)
50 v-model="v.count" :max="v.leftNum" :min="0" :precision="0" class="inputNumber" 50 }}
51 @change="countTotal" 51 {{
52 /> 52 triggerLanguage(language, '￥/人', '€/person')
53 <i class="residue">{{ language == 0 ? '剩余票数' : 'Remaining votes' }}{{ v.leftNum }}</i> 53 }}
54 </span> 54 </span>
55 55 </div>
56 </div> 56 </div>
57 </div> 57 </div>
58 <!-- 价格 -->
58 </div> 59 </div>
59 60
60 <!-- 价格 --> 61 <div style="height: 10px;" />
61 <div class="select_item_box"> 62 <div class="select_item_box flex">
62 <div class="label"> 63 <div class="label">
63 {{ triggerLanguage(language, '价格', "Price") }} : 64 {{ triggerLanguage(language, '价格', "Price") }} :
64 </div> 65 </div>
65 </div> 66 <div class="price">
66 <div class="select_item_box"> 67 {{ language == 0 ? '￥' : '€' }} {{ language == 0 ? selectForm.price : selectForm.priceEn }}
67 <div class="select_item">
68 <div class="tagActive" style="min-width: 80px">
69 {{ language == 0 ? '￥' : '€' }} {{ language == 0 ? selectForm.price : selectForm.priceEn }}
70 </div>
71 </div> 68 </div>
72 </div> 69 </div>
73 <!-- 购票备注-->
74 <div v-if="matchForm.ticketRemark" class="select_item_box"> 70 <div v-if="matchForm.ticketRemark" class="select_item_box">
75 <div class="label"> 71 <div class="label">
76 {{ 72 {{
...@@ -84,6 +80,8 @@ ...@@ -84,6 +80,8 @@
84 </div> 80 </div>
85 </div> 81 </div>
86 82
83 <div style="height: 10px;" />
84
87 <div 85 <div
88 v-if="endTime<=0" class="btn" 86 v-if="endTime<=0" class="btn"
89 style="margin-left: 40px;opacity: 0.5;cursor: not-allowed;margin-top: 10px" 87 style="margin-left: 40px;opacity: 0.5;cursor: not-allowed;margin-top: 10px"
...@@ -187,6 +185,11 @@ async function getGateListByLasId() { ...@@ -187,6 +185,11 @@ async function getGateListByLasId() {
187 for (const v of ticketList.value) { 185 for (const v of ticketList.value) {
188 v.leftNum = v.num - v.orderCount 186 v.leftNum = v.num - v.orderCount
189 v.count = 0 187 v.count = 0
188 if (language.value == 0) {
189 v.show = v.price > 0
190 } else {
191 v.show = v.priceEn > 0
192 }
190 } 193 }
191 } 194 }
192 195
...@@ -236,7 +239,7 @@ async function toSelectSeat() { ...@@ -236,7 +239,7 @@ async function toSelectSeat() {
236 async function checkOrderPay() { 239 async function checkOrderPay() {
237 const res = await booking.checkOrderPay(8) 240 const res = await booking.checkOrderPay(8)
238 if (res.data == -100) { 241 if (res.data == -100) {
239 await proxy.$modal.confirm(language.value == 0 ? '你有未支付的旅游预订，是否前往个人中心查看?' : 'You already have an unpaid travel order, do you want to go to the personal center to check it?') 242 await proxy.$modal.confirm(language.value == 0 ? '您有未支付的订单，请前往支付。' : 'You have unpaid orders, please proceed to payment.')
240 await router.push({ 243 await router.push({
241 name: 'myReservation' 244 name: 'myReservation'
242 }) 245 })
...@@ -338,17 +341,26 @@ function toSelectClosed() { ...@@ -338,17 +341,26 @@ function toSelectClosed() {
338 margin-bottom: 15px; 341 margin-bottom: 15px;
339 } 342 }
340 343
341 .select_item_box { 344 .flex {
342 display: flex; 345 display: flex;
343 margin-bottom: 10px; 346 align-items: end;
347 }
348
349 .select_item_box {
350 //display: flex;
351 margin-bottom: 5px;
344 352
345 &:last-child { 353 .price {
346 margin-bottom: 0; 354 font-size: 35px;
355 font-weight: 600;
356 color: #493ceb;
357 position: relative;
358 bottom: -8px;
347 } 359 }
348 360
349 .label { 361 .label {
350 font-weight: 600; 362 font-weight: 600;
351 font-size: 16px; 363 font-size: 20px;
352 color: #000; 364 color: #000;
353 line-height: 24px; 365 line-height: 24px;
354 margin-right: 12px; 366 margin-right: 12px;
...@@ -371,10 +383,11 @@ function toSelectClosed() { ...@@ -371,10 +383,11 @@ function toSelectClosed() {
371 color: #493ceb; 383 color: #493ceb;
372 cursor: pointer; 384 cursor: pointer;
373 font-weight: 600; 385 font-weight: 600;
374 font-size: 18px; 386 font-size: 24px;
375 margin-right: 30px; 387 margin-right: 30px;
376 height: 40px; 388 height: 40px;
377 line-height: 40px; 389 line-height: 40px;
390 margin-left: 30px;
378 } 391 }
379 392
380 393
......
src/viewsPc/booking/travelOrder.vue
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
15 <el-col :span="language == 0?16:24"> 15 <el-col :span="language == 0?16:24">
16 <h3 class="esp flex">{{ scenicItem?.name }} 16 <h3 class="esp flex">{{ scenicItem?.name }}
17 17
18 <el-tag class="ml20" effect="dark">{{ scenicItem?.rank || 0 }}A</el-tag> 18 <!-- <el-tag class="ml20" effect="dark">{{ scenicItem?.rank || 0 }}A</el-tag>-->
19 </h3> 19 </h3>
20 <div class="info"> 20 <div class="info">
21 <el-icon> 21 <el-icon>
22 <Clock /> 22 <Clock />
23 </el-icon> 23 </el-icon>
24 <span class="mr10">{{ language == 0 ? '开园时间' : 'Opening Time' }}：{{ scenicItem?.startTime }} ～ {{ 24 <span class="mr10">{{ language == 0 ? '出发时间' : 'Opening Time' }}：{{ scenicItem?.startTime }} ～ {{
25 scenicItem?.workTime 25 scenicItem?.workTime
26 }}</span> 26 }}</span>
27 </div> 27 </div>
...@@ -29,7 +29,9 @@ ...@@ -29,7 +29,9 @@
29 <el-icon> 29 <el-icon>
30 <Phone /> 30 <Phone />
31 </el-icon> 31 </el-icon>
32 <span class="mr10">{{ language == 0 ? '联系方式' : 'Contact' }}：{{ scenicItem?.contact }}</span> 32 <span class="mr10">{{ language == 0 ? '联系方式' : 'Contact Number' }}：{{
33 scenicItem?.contact
34 }}</span>
33 </div> 35 </div>
34 <div class="info esp"> 36 <div class="info esp">
35 <el-icon> 37 <el-icon>
...@@ -119,7 +121,7 @@ ...@@ -119,7 +121,7 @@
119 <el-form-item :label="language==0?'联系人':'Contact'" prop="contacts"> 121 <el-form-item :label="language==0?'联系人':'Contact'" prop="contacts">
120 <el-input v-model="form.contacts" /> 122 <el-input v-model="form.contacts" />
121 </el-form-item> 123 </el-form-item>
122 <el-form-item :label="language==0?'联系手机':'Contact phone'" prop="phone" required> 124 <el-form-item :label="language==0?'联系电话':'Contact phone'" prop="phone" required>
123 <el-input v-model="form.phone" /> 125 <el-input v-model="form.phone" />
124 </el-form-item> 126 </el-form-item>
125 127
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!