From 461824fa3c6dfd734497cd63486a8b0ef9045d98 Mon Sep 17 00:00:00 2001 From: "wood.wu" Date: Mon, 18 Mar 2024 14:57:14 +0800 Subject: [PATCH] Updated apr,may --- src/App/Carousel.js | 2 +- src/App/Guide.js | 4 ++-- src/App/Report.js | 2 +- src/App/ScheduleData.js | 25 ++++++++++++++++++++++++- src/App/_mobile.scss | 22 +++++++++++++--------- src/App/index.scss | 5 +++++ src/locales/en.json | 1 + src/locales/zh-TW.json | 1 + 8 files changed, 48 insertions(+), 14 deletions(-) diff --git a/src/App/Carousel.js b/src/App/Carousel.js index 1df3bf1..31d13c4 100644 --- a/src/App/Carousel.js +++ b/src/App/Carousel.js @@ -29,7 +29,7 @@ function Carousel ({slides}) { return {t('order_ticket_10')} ; case 'free_reserve': return {t('reserve_ticket')} ; - case 'buyfirst': + case 'buyfirst': return {t('order_ticket_first')} ; default: return 'foo'; diff --git a/src/App/Guide.js b/src/App/Guide.js index 545a816..d3fc30c 100644 --- a/src/App/Guide.js +++ b/src/App/Guide.js @@ -83,7 +83,7 @@ function Guide() { {t(`${item.show}`)} { item.show2 && -
{t(`${item.show2}`)}
+
{t(`${item.show2}`)}
} @@ -91,7 +91,7 @@ function Guide() { { item.title2 && -
+
} {item.price &&
{t(`${item.price}`)}
} diff --git a/src/App/Report.js b/src/App/Report.js index 660d814..226267b 100644 --- a/src/App/Report.js +++ b/src/App/Report.js @@ -63,7 +63,7 @@ function Report() {
+
{t('guide_category_1')}
-
NT$ 399 / 時間 60 {t('minute')}
+
NT$ 299 / 時間 60 {t('minute')}
diff --git a/src/App/ScheduleData.js b/src/App/ScheduleData.js index 6f49ee5..d9e2347 100644 --- a/src/App/ScheduleData.js +++ b/src/App/ScheduleData.js @@ -50,10 +50,33 @@ export const data_9 = [ ] export const month_data = [ - {title:'feb_title',index:4}, + {title:'apr_title',index:4}, + {title:'may_title',index:4}, ] export const data = [ + { + id:5, + title:'apr_title', + subtitle:'apr_subtitle', + data:[ + { time:"14:00", show:"show_name_9", title:"guide_category_4"}, + { time:"15:00", show:"mar_show_name_3",title:"guide_category_2"}, + { time:"16:00", show:"show_name_9", title:"guide_category_4"}, + { time:"17:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"}, + { time:"18:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"}, + ] + }, { + id:5, + title:'may_title', + data:[ + { time:"14:00", show:"show_name_9", title:"guide_category_4"}, + { time:"15:00", show:"mar_show_name_3",title:"guide_category_2"}, + { time:"16:00", show:"show_name_9", title:"guide_category_4"}, + { time:"17:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"}, + { time:"18:00", show:"show_name_6",show2:"show_name_10", title:"guide_category_1",title2:"guide_category_2"}, + ] + }, { id:5, title:'feb_title', diff --git a/src/App/_mobile.scss b/src/App/_mobile.scss index d8dbd2f..a9fba0d 100644 --- a/src/App/_mobile.scss +++ b/src/App/_mobile.scss @@ -139,22 +139,26 @@ text-align: center; } .content{ - .dates_info{ - flex-direction: column; - .dates_date{ + .dates_info{ + flex-direction: column; + .dates_date{ + width: 100%; + } + } + .data-list{ + flex-direction: column; + width: 70%; + } + .guide_table { width: 100%; } - } - .data-list{ - flex-direction: column; - width: 70%; - } - + } } } + .partner { .title{ font-size: 30px; diff --git a/src/App/index.scss b/src/App/index.scss index f9f42b0..3e430dd 100644 --- a/src/App/index.scss +++ b/src/App/index.scss @@ -658,6 +658,11 @@ body{ .text_free{ color: #fc2b2b; } + .border-t-dashed{ + border-top: dashed #aaa 1px; + margin-top: 10px; + padding-top: 10px; + } } } } diff --git a/src/locales/en.json b/src/locales/en.json index 7fef839..eb52b24 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -86,6 +86,7 @@ "feb_title":"February", "mar_title":"March", "apr_title":"April", + "apr_subtitle":"4/12(Fri.) ~ 4/14(Sun.) No performances during the special exhibition period. The special exhibition is currently being finalized—stay tuned!", "apr_title1":"April 4/1-4/14 ", "apr_title2":"April 4/15-4/30", "may_title":"MAY SCHEDULE", diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json index c30d5ed..41f0080 100644 --- a/src/locales/zh-TW.json +++ b/src/locales/zh-TW.json @@ -86,6 +86,7 @@ "feb_title":"二月份場次表", "mar_title":"三月份場次表", "apr_title":"四月份場次表", + "apr_subtitle":"4/12(五) ~ 4/14(日) 特展期間無場次開放，特展內容最終確認中！", "apr_title1":"四月份場次表 4/1-4/14 ", "apr_title2":"四月份場次表 4/15-4/30", "may_title":"五月份場次表",