Merge commit '0b6f8d31' into dev
Showing
3 changed files
with
21 additions
and
1 deletions
| ... | @@ -70,6 +70,16 @@ const payment = reactive({ | ... | @@ -70,6 +70,16 @@ const payment = reactive({ |
| 70 | "Please enter the contact phone number." | 70 | "Please enter the contact phone number." |
| 71 | ), | 71 | ), |
| 72 | }); | 72 | }); |
| 73 | if (/^[1][3,4,5,7,8][0-9]{9}$/.test(payment.form.phone)) { | ||
| 74 | return ElMessage({ | ||
| 75 | type: "warning", | ||
| 76 | message: languageFormat( | ||
| 77 | language.value, | ||
| 78 | "联系电话格式不正确", | ||
| 79 | "The format of the contact phone is incorrect." | ||
| 80 | ), | ||
| 81 | }); | ||
| 82 | } | ||
| 73 | if (language.value == 0) { | 83 | if (language.value == 0) { |
| 74 | payOrder({ | 84 | payOrder({ |
| 75 | contactPhone: payment.form.phone, | 85 | contactPhone: payment.form.phone, |
| ... | @@ -98,6 +108,9 @@ const payment = reactive({ | ... | @@ -98,6 +108,9 @@ const payment = reactive({ |
| 98 | payment.qrCodeData = ""; | 108 | payment.qrCodeData = ""; |
| 99 | clearInterval(timer); | 109 | clearInterval(timer); |
| 100 | timer = null; | 110 | timer = null; |
| 111 | router.replace({ | ||
| 112 | path: "/seat/order", | ||
| 113 | }); | ||
| 101 | }, | 114 | }, |
| 102 | }); | 115 | }); |
| 103 | 116 | ... | ... |
| ... | @@ -285,6 +285,13 @@ detail.fetchData(); | ... | @@ -285,6 +285,13 @@ detail.fetchData(); |
| 285 | <div class="tr"> | 285 | <div class="tr"> |
| 286 | <div style="width: 30.33%" class="td flex-col"> | 286 | <div style="width: 30.33%" class="td flex-col"> |
| 287 | <div>{{ detail.data?.dateStr }}</div> | 287 | <div>{{ detail.data?.dateStr }}</div> |
| 288 | <div> | ||
| 289 | {{ | ||
| 290 | detail.data?.openType == 0 | ||
| 291 | ? languageFormat(language, "日场", "Day session") | ||
| 292 | : languageFormat(language, "夜场", "Night session") | ||
| 293 | }} | ||
| 294 | </div> | ||
| 288 | <div v-for="(it, index) in detail.data?.seatList" :key="index"> | 295 | <div v-for="(it, index) in detail.data?.seatList" :key="index"> |
| 289 | <span v-if="it.venueId == 1" | 296 | <span v-if="it.venueId == 1" |
| 290 | >{{ it.area | 297 | >{{ it.area | ... | ... |
| ... | @@ -254,7 +254,7 @@ onMounted(() => { | ... | @@ -254,7 +254,7 @@ onMounted(() => { |
| 254 | class="tag" | 254 | class="tag" |
| 255 | > | 255 | > |
| 256 | {{ | 256 | {{ |
| 257 | language == 0 ? status[it.state].txt : status[it.state].txt_en | 257 | language == 0 ? status[it.state].txt : status[it.state].text_en |
| 258 | }} | 258 | }} |
| 259 | </div> | 259 | </div> |
| 260 | <div v-if="it.state == 0" class="tip"> | 260 | <div v-if="it.state == 0" class="tip"> | ... | ... |
-
Please register or sign in to post a comment