diff --git a/view/peko/activity/2024-yearBenefits/css/index.css b/view/peko/activity/2024-yearBenefits/css/index.css index 7306e01..278606e 100644 --- a/view/peko/activity/2024-yearBenefits/css/index.css +++ b/view/peko/activity/2024-yearBenefits/css/index.css @@ -79,10 +79,6 @@ body { color: transparent; } -.page1 { - display: none; -} - .page1 .pageImg1 { display: block; width: 9.2rem; @@ -97,6 +93,10 @@ body { margin: 0 auto 0.46667rem; } +.page2 { + display: none; +} + .page2 .box { width: 9.2rem; height: 17.14667rem; @@ -320,6 +320,12 @@ body { .page2 .box ul { width: 8.56rem; margin: 0 auto 1.84rem; + overflow-y: scroll; + height: 6.6rem; +} + +.page2 .box ul::-webkit-scrollbar { + display: none; } .page2 .box ul li { @@ -442,6 +448,7 @@ body { } .rule { + display: none; position: fixed; left: 0; top: 0; @@ -460,4 +467,98 @@ body { left: 50%; top: 50%; transform: translate(-50%, -50%); + overflow: hidden; +} + +.rule .rule_in .tabRule { + width: 6.50667rem; + height: 1.01333rem; + line-height: 1.01333rem; + display: flex; + justify-content: space-between; + border-radius: 0.64rem; + background: #fff; + margin: 0.6rem auto 0.25333rem; +} + +.rule .rule_in .tabRule div { + text-align: center; + color: #CA5987; + font-size: 0.37333rem; + font-weight: 500; + width: 3.25333rem; +} + +.rule .rule_in .tabRule .act { + background: url(../images/rule_act.png) no-repeat; + background-size: 100% 100%; + color: #fff; +} + +.rule .rule_in .box1 { + width: 7.34667rem; + height: 11.4rem; + overflow-y: scroll; + margin: 0 auto; +} + +.rule .rule_in .box1::-webkit-scrollbar { + display: none; +} + +.rule .rule_in .box1 img { + display: block; + width: 7.25333rem; +} + +.rule .rule_in .box2 { + display: none; +} + +.rule .rule_in .box2 .box2Tab { + width: 4.74667rem; + height: 0.8rem; + margin: 0 auto 0.26667rem; + display: flex; + justify-content: space-between; +} + +.rule .rule_in .box2 .box2Tab div { + width: 2.34667rem; +} + +.rule .rule_in .box2 .box2Tab .tab1 { + background: url(../images/box2tab1.png) no-repeat; + background-size: 100% 100%; +} + +.rule .rule_in .box2 .box2Tab .tab2 { + background: url(../images/box2tab2.png) no-repeat; + background-size: 100% 100%; +} + +.rule .rule_in .box2 .box2Tab .act1 { + background: url(../images/box2tabAct1.png) no-repeat; + background-size: 100% 100%; +} + +.rule .rule_in .box2 .box2Tab .act2 { + background: url(../images/box2tabAct2.png) no-repeat; + background-size: 100% 100%; +} + +.rule .rule_in .box2 .imgBox { + width: 7.52rem; + height: 10rem; + margin: 0 auto; + overflow-y: scroll; +} + +.rule .rule_in .box2 .imgBox::-webkit-scrollbar { + display: none; +} + +.rule .rule_in .box2 .imgBox img { + width: 100%; + display: block; } diff --git a/view/peko/activity/2024-yearBenefits/css/index.scss b/view/peko/activity/2024-yearBenefits/css/index.scss index 266f478..db916f2 100644 --- a/view/peko/activity/2024-yearBenefits/css/index.scss +++ b/view/peko/activity/2024-yearBenefits/css/index.scss @@ -85,7 +85,7 @@ body { } .page1 { - display: none; + // display: none; .pageImg1 { display: block; @@ -103,6 +103,8 @@ body { } .page2 { + display: none; + .box { width: px2rem(690); height: px2rem(1286); @@ -329,6 +331,12 @@ body { ul { width: px2rem(642); margin: 0 auto px2rem(138); + overflow-y: scroll; + height: 6.6rem; + + &::-webkit-scrollbar { + display: none; + } li { width: 100%; @@ -456,6 +464,7 @@ body { } .rule { + display: none; position: fixed; left: 0; top: 0; @@ -473,5 +482,100 @@ body { left: 50%; top: 50%; transform: translate(-50%, -50%); + overflow: hidden; + + .tabRule { + width: px2rem(488); + height: px2rem(76); + line-height: px2rem(76); + display: flex; + justify-content: space-between; + border-radius: px2rem(48); + background: #fff; + margin: px2rem(45) auto px2rem(19); + + div { + text-align: center; + color: #CA5987; + font-size: px2rem(28); + font-weight: 500; + width: px2rem(244); + } + + .act { + background: url(../images/rule_act.png) no-repeat; + background-size: 100% 100%; + color: #fff; + } + } + + .box1 { + width: px2rem(551); + height: 11.4rem; + overflow-y: scroll; + margin: 0 auto; + // display: none; + + &::-webkit-scrollbar { + display: none; + } + + img { + display: block; + width: px2rem(544); + } + } + + .box2 { + display: none; + + .box2Tab { + width: px2rem(356); + height: px2rem(60); + margin: 0 auto px2rem(20); + display: flex; + justify-content: space-between; + + div { + width: px2rem(176); + } + + .tab1 { + background: url(../images/box2tab1.png) no-repeat; + background-size: 100% 100%; + } + + .tab2 { + background: url(../images/box2tab2.png) no-repeat; + background-size: 100% 100%; + } + + .act1 { + background: url(../images/box2tabAct1.png) no-repeat; + background-size: 100% 100%; + } + + .act2 { + background: url(../images/box2tabAct2.png) no-repeat; + background-size: 100% 100%; + } + } + + .imgBox { + width: px2rem(564); + height: 10rem; + margin: 0 auto; + overflow-y: scroll; + + &::-webkit-scrollbar { + display: none; + } + + img { + width: 100%; + display: block; + } + } + } } } \ No newline at end of file diff --git a/view/peko/activity/2024-yearBenefits/images/box2tab1.png b/view/peko/activity/2024-yearBenefits/images/box2tab1.png new file mode 100644 index 0000000..5cb98d8 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/box2tab1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/box2tab2.png b/view/peko/activity/2024-yearBenefits/images/box2tab2.png new file mode 100644 index 0000000..c3c1c26 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/box2tab2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/box2tabAct1.png b/view/peko/activity/2024-yearBenefits/images/box2tabAct1.png new file mode 100644 index 0000000..99d2664 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/box2tabAct1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/box2tabAct2.png b/view/peko/activity/2024-yearBenefits/images/box2tabAct2.png new file mode 100644 index 0000000..59d1f00 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/box2tabAct2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/header.png b/view/peko/activity/2024-yearBenefits/images/header.png index e7eb1c0..b92153e 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/header.png and b/view/peko/activity/2024-yearBenefits/images/header.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/img1.png b/view/peko/activity/2024-yearBenefits/images/img1.png new file mode 100644 index 0000000..43720d8 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/img1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/img2.png b/view/peko/activity/2024-yearBenefits/images/img2.png new file mode 100644 index 0000000..9f65230 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/img2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/listTab1.png b/view/peko/activity/2024-yearBenefits/images/listTab1.png index 8ecae3e..6f932a8 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/listTab1.png and b/view/peko/activity/2024-yearBenefits/images/listTab1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/listTab2.png b/view/peko/activity/2024-yearBenefits/images/listTab2.png index 8ecae3e..0a64568 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/listTab2.png and b/view/peko/activity/2024-yearBenefits/images/listTab2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/logo.png b/view/peko/activity/2024-yearBenefits/images/logo.png index 4c661e5..e428641 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/logo.png and b/view/peko/activity/2024-yearBenefits/images/logo.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/my.png b/view/peko/activity/2024-yearBenefits/images/my.png index a5e2eae..5d1baef 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/my.png and b/view/peko/activity/2024-yearBenefits/images/my.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/name1.png b/view/peko/activity/2024-yearBenefits/images/name1.png index 168aacf..ad5d7d4 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/name1.png and b/view/peko/activity/2024-yearBenefits/images/name1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/name2.png b/view/peko/activity/2024-yearBenefits/images/name2.png index 0b42562..f80d7bb 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/name2.png and b/view/peko/activity/2024-yearBenefits/images/name2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/name3.png b/view/peko/activity/2024-yearBenefits/images/name3.png index 788230d..6836fec 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/name3.png and b/view/peko/activity/2024-yearBenefits/images/name3.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/page2Bg.png b/view/peko/activity/2024-yearBenefits/images/page2Bg.png index 94819d3..9b4deb8 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/page2Bg.png and b/view/peko/activity/2024-yearBenefits/images/page2Bg.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/pageImg1.png b/view/peko/activity/2024-yearBenefits/images/pageImg1.png index 2f522ab..c737e81 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/pageImg1.png and b/view/peko/activity/2024-yearBenefits/images/pageImg1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/pageImg2.png b/view/peko/activity/2024-yearBenefits/images/pageImg2.png index 1eecebc..54a9f71 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/pageImg2.png and b/view/peko/activity/2024-yearBenefits/images/pageImg2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/rule1.png b/view/peko/activity/2024-yearBenefits/images/rule1.png new file mode 100644 index 0000000..e960fc5 Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/rule1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/rule_act.png b/view/peko/activity/2024-yearBenefits/images/rule_act.png new file mode 100644 index 0000000..7503f9e Binary files /dev/null and b/view/peko/activity/2024-yearBenefits/images/rule_act.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/rule_bg.png b/view/peko/activity/2024-yearBenefits/images/rule_bg.png index 0a801a7..f3f4a91 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/rule_bg.png and b/view/peko/activity/2024-yearBenefits/images/rule_bg.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/rule_icon.png b/view/peko/activity/2024-yearBenefits/images/rule_icon.png index b11dcae..5d0741a 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/rule_icon.png and b/view/peko/activity/2024-yearBenefits/images/rule_icon.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/tab1.png b/view/peko/activity/2024-yearBenefits/images/tab1.png index 5f46e37..9fb0302 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/tab1.png and b/view/peko/activity/2024-yearBenefits/images/tab1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/tab2.png b/view/peko/activity/2024-yearBenefits/images/tab2.png index 04dc5a3..fb1b44e 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/tab2.png and b/view/peko/activity/2024-yearBenefits/images/tab2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/ts1.png b/view/peko/activity/2024-yearBenefits/images/ts1.png index 5f1940b..941eef6 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/ts1.png and b/view/peko/activity/2024-yearBenefits/images/ts1.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/ts2.png b/view/peko/activity/2024-yearBenefits/images/ts2.png index 82937ec..8a51325 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/ts2.png and b/view/peko/activity/2024-yearBenefits/images/ts2.png differ diff --git a/view/peko/activity/2024-yearBenefits/images/ts3.png b/view/peko/activity/2024-yearBenefits/images/ts3.png index 70fe488..9799afb 100644 Binary files a/view/peko/activity/2024-yearBenefits/images/ts3.png and b/view/peko/activity/2024-yearBenefits/images/ts3.png differ diff --git a/view/peko/activity/2024-yearBenefits/index.html b/view/peko/activity/2024-yearBenefits/index.html index ba70b89..7832fae 100644 --- a/view/peko/activity/2024-yearBenefits/index.html +++ b/view/peko/activity/2024-yearBenefits/index.html @@ -10,51 +10,51 @@
- +本活動最終解釋權歸官方所有
本活動以及獎勵與蘋果/Google公司無關