diff --git a/view/yinmeng/activity/2024-lover/css/index.css b/view/yinmeng/activity/2024-lover/css/index.css index e6e1b21..a13d26f 100644 --- a/view/yinmeng/activity/2024-lover/css/index.css +++ b/view/yinmeng/activity/2024-lover/css/index.css @@ -364,7 +364,6 @@ body { } .page2 .box .i1 { - width: 3.78667rem; height: 0.56rem; line-height: 0.56rem; border-radius: 0.56rem; @@ -373,6 +372,7 @@ body { font-size: 0.32rem; top: 2.53333rem; background: #9789E9; + padding: 0 0.26667rem; } .page2 .box .i2 { @@ -501,8 +501,7 @@ body { height: 0.26667rem; border-radius: 0.26667rem; position: absolute; - border: 0.02667rem solid #7151CE; - left: 0; + left: 0.02667rem; top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -643,12 +642,11 @@ body { } .page2 .box .tasks2 .line span { - width: 10%; + width: 98.8%; height: 0.26667rem; border-radius: 0.26667rem; position: absolute; - border: 0.02667rem solid #7151CE; - left: 0; + left: 0.02667rem; top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -833,8 +831,7 @@ body { height: 0.26667rem; border-radius: 0.26667rem; position: absolute; - border: 0.02667rem solid #7151CE; - left: 0; + left: 0.02667rem; top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -985,8 +982,7 @@ body { height: 0.26667rem; border-radius: 0.26667rem; position: absolute; - border: 0.02667rem solid #7151CE; - left: 0; + left: 0.02667rem; top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -1407,6 +1403,7 @@ body { font-weight: 500; background: url(../images/love_h.png) no-repeat; background-size: 100% 100%; + white-space: nowrap; } .page3 .my .myBox .leftTx { diff --git a/view/yinmeng/activity/2024-lover/css/index.scss b/view/yinmeng/activity/2024-lover/css/index.scss index 6da440f..987fd3e 100644 --- a/view/yinmeng/activity/2024-lover/css/index.scss +++ b/view/yinmeng/activity/2024-lover/css/index.scss @@ -374,7 +374,7 @@ body { } .i1 { - width: px2rem(284); + // width: px2rem(284); height: px2rem(42); line-height: px2rem(42); border-radius: px2rem(42); @@ -383,6 +383,7 @@ body { font-size: px2rem(24); top: px2rem(190); background: #9789E9; + padding: 0 px2rem(20); } .i2 { @@ -510,8 +511,9 @@ body { height: px2rem(20); border-radius: px2rem(20); position: absolute; - border: px2rem(2) solid #7151CE; - left: 0; + // border-left: px2rem(2) solid #7151CE; + // border-right: px2rem(2) solid #7151CE; + left: px2rem(2); top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -655,12 +657,12 @@ body { background: #7466c4; span { - width: 10%; + width: 98.8%; height: px2rem(20); border-radius: px2rem(20); position: absolute; - border: px2rem(2) solid #7151CE; - left: 0; + // border: px2rem(2) solid #7151CE; + left: px2rem(2); top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -848,8 +850,8 @@ body { height: px2rem(20); border-radius: px2rem(20); position: absolute; - border: px2rem(2) solid #7151CE; - left: 0; + // border: px2rem(2) solid #7151CE; + left: px2rem(2); top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -1004,8 +1006,8 @@ body { height: px2rem(20); border-radius: px2rem(20); position: absolute; - border: px2rem(2) solid #7151CE; - left: 0; + // border: px2rem(2) solid #7151CE; + left: px2rem(2); top: 50%; transform: translateY(-50%); background: linear-gradient(90deg, #B4A8FE 0%, #DBF4FA 100%); @@ -1438,6 +1440,7 @@ body { font-weight: 500; background: url(../images/love_h.png) no-repeat; background-size: 100% 100%; + white-space: nowrap } .leftTx { diff --git a/view/yinmeng/activity/2024-lover/images/1.png b/view/yinmeng/activity/2024-lover/images/1.png index f1676c7..2a7cba3 100644 Binary files a/view/yinmeng/activity/2024-lover/images/1.png and b/view/yinmeng/activity/2024-lover/images/1.png differ diff --git a/view/yinmeng/activity/2024-lover/images/2.png b/view/yinmeng/activity/2024-lover/images/2.png index bc95673..5937d05 100644 Binary files a/view/yinmeng/activity/2024-lover/images/2.png and b/view/yinmeng/activity/2024-lover/images/2.png differ diff --git a/view/yinmeng/activity/2024-lover/images/3.png b/view/yinmeng/activity/2024-lover/images/3.png index 43e11ea..d408c92 100644 Binary files a/view/yinmeng/activity/2024-lover/images/3.png and b/view/yinmeng/activity/2024-lover/images/3.png differ diff --git a/view/yinmeng/activity/2024-lover/images/4.png b/view/yinmeng/activity/2024-lover/images/4.png index 0696c38..05a1487 100644 Binary files a/view/yinmeng/activity/2024-lover/images/4.png and b/view/yinmeng/activity/2024-lover/images/4.png differ diff --git a/view/yinmeng/activity/2024-lover/images/5.png b/view/yinmeng/activity/2024-lover/images/5.png index dc67bd9..8f6f55d 100644 Binary files a/view/yinmeng/activity/2024-lover/images/5.png and b/view/yinmeng/activity/2024-lover/images/5.png differ diff --git a/view/yinmeng/activity/2024-lover/images/6.png b/view/yinmeng/activity/2024-lover/images/6.png index 66999d9..021b5cc 100644 Binary files a/view/yinmeng/activity/2024-lover/images/6.png and b/view/yinmeng/activity/2024-lover/images/6.png differ diff --git a/view/yinmeng/activity/2024-lover/images/bottom.png b/view/yinmeng/activity/2024-lover/images/bottom.png index ddb4bf6..90ac695 100644 Binary files a/view/yinmeng/activity/2024-lover/images/bottom.png and b/view/yinmeng/activity/2024-lover/images/bottom.png differ diff --git a/view/yinmeng/activity/2024-lover/images/buyBgPub.png b/view/yinmeng/activity/2024-lover/images/buyBgPub.png index 2c26194..e54a3f3 100644 Binary files a/view/yinmeng/activity/2024-lover/images/buyBgPub.png and b/view/yinmeng/activity/2024-lover/images/buyBgPub.png differ diff --git a/view/yinmeng/activity/2024-lover/images/buyTitle.png b/view/yinmeng/activity/2024-lover/images/buyTitle.png index a1ca671..29a8ab7 100644 Binary files a/view/yinmeng/activity/2024-lover/images/buyTitle.png and b/view/yinmeng/activity/2024-lover/images/buyTitle.png differ diff --git a/view/yinmeng/activity/2024-lover/images/buy_z.png b/view/yinmeng/activity/2024-lover/images/buy_z.png index e50dc75..1fc58ed 100644 Binary files a/view/yinmeng/activity/2024-lover/images/buy_z.png and b/view/yinmeng/activity/2024-lover/images/buy_z.png differ diff --git a/view/yinmeng/activity/2024-lover/images/close.png b/view/yinmeng/activity/2024-lover/images/close.png index 28469e3..a7623a3 100644 Binary files a/view/yinmeng/activity/2024-lover/images/close.png and b/view/yinmeng/activity/2024-lover/images/close.png differ diff --git a/view/yinmeng/activity/2024-lover/images/diamond.png b/view/yinmeng/activity/2024-lover/images/diamond.png index 4e8f6f6..bf3360d 100644 Binary files a/view/yinmeng/activity/2024-lover/images/diamond.png and b/view/yinmeng/activity/2024-lover/images/diamond.png differ diff --git a/view/yinmeng/activity/2024-lover/images/end.png b/view/yinmeng/activity/2024-lover/images/end.png index ee3b9d1..5cc892a 100644 Binary files a/view/yinmeng/activity/2024-lover/images/end.png and b/view/yinmeng/activity/2024-lover/images/end.png differ diff --git a/view/yinmeng/activity/2024-lover/images/endTitle.png b/view/yinmeng/activity/2024-lover/images/endTitle.png index 05fa121..1c3357f 100644 Binary files a/view/yinmeng/activity/2024-lover/images/endTitle.png and b/view/yinmeng/activity/2024-lover/images/endTitle.png differ diff --git a/view/yinmeng/activity/2024-lover/images/failureBuyTitle.png b/view/yinmeng/activity/2024-lover/images/failureBuyTitle.png index f72ee27..fd631d1 100644 Binary files a/view/yinmeng/activity/2024-lover/images/failureBuyTitle.png and b/view/yinmeng/activity/2024-lover/images/failureBuyTitle.png differ diff --git a/view/yinmeng/activity/2024-lover/images/giftNameBg.png b/view/yinmeng/activity/2024-lover/images/giftNameBg.png index c89b06a..1533e5c 100644 Binary files a/view/yinmeng/activity/2024-lover/images/giftNameBg.png and b/view/yinmeng/activity/2024-lover/images/giftNameBg.png differ diff --git a/view/yinmeng/activity/2024-lover/images/header.png b/view/yinmeng/activity/2024-lover/images/header.png index 3ebdeaa..2d57604 100644 Binary files a/view/yinmeng/activity/2024-lover/images/header.png and b/view/yinmeng/activity/2024-lover/images/header.png differ diff --git a/view/yinmeng/activity/2024-lover/images/logo.png b/view/yinmeng/activity/2024-lover/images/logo.png index 4c661e5..e428641 100644 Binary files a/view/yinmeng/activity/2024-lover/images/logo.png and b/view/yinmeng/activity/2024-lover/images/logo.png differ diff --git a/view/yinmeng/activity/2024-lover/images/loveBox.png b/view/yinmeng/activity/2024-lover/images/loveBox.png index e2d83d1..1b45677 100644 Binary files a/view/yinmeng/activity/2024-lover/images/loveBox.png and b/view/yinmeng/activity/2024-lover/images/loveBox.png differ diff --git a/view/yinmeng/activity/2024-lover/images/love_h.png b/view/yinmeng/activity/2024-lover/images/love_h.png index 382e593..79b26bf 100644 Binary files a/view/yinmeng/activity/2024-lover/images/love_h.png and b/view/yinmeng/activity/2024-lover/images/love_h.png differ diff --git a/view/yinmeng/activity/2024-lover/images/love_z.png b/view/yinmeng/activity/2024-lover/images/love_z.png index d00a154..a54a07a 100644 Binary files a/view/yinmeng/activity/2024-lover/images/love_z.png and b/view/yinmeng/activity/2024-lover/images/love_z.png differ diff --git a/view/yinmeng/activity/2024-lover/images/mp.png b/view/yinmeng/activity/2024-lover/images/mp.png index 7fff283..0fde102 100644 Binary files a/view/yinmeng/activity/2024-lover/images/mp.png and b/view/yinmeng/activity/2024-lover/images/mp.png differ diff --git a/view/yinmeng/activity/2024-lover/images/myBg.png b/view/yinmeng/activity/2024-lover/images/myBg.png index bcfef76..e01eaea 100644 Binary files a/view/yinmeng/activity/2024-lover/images/myBg.png and b/view/yinmeng/activity/2024-lover/images/myBg.png differ diff --git a/view/yinmeng/activity/2024-lover/images/myBg2.png b/view/yinmeng/activity/2024-lover/images/myBg2.png index f0db37c..1658cd3 100644 Binary files a/view/yinmeng/activity/2024-lover/images/myBg2.png and b/view/yinmeng/activity/2024-lover/images/myBg2.png differ diff --git a/view/yinmeng/activity/2024-lover/images/ok.png b/view/yinmeng/activity/2024-lover/images/ok.png index 0a22ebd..55c6d9b 100644 Binary files a/view/yinmeng/activity/2024-lover/images/ok.png and b/view/yinmeng/activity/2024-lover/images/ok.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page1Bg1Title.png b/view/yinmeng/activity/2024-lover/images/page1Bg1Title.png index 9a770c7..dc0e1f2 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page1Bg1Title.png and b/view/yinmeng/activity/2024-lover/images/page1Bg1Title.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page1Bg2Title.png b/view/yinmeng/activity/2024-lover/images/page1Bg2Title.png index 5b4fe55..cbecc67 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page1Bg2Title.png and b/view/yinmeng/activity/2024-lover/images/page1Bg2Title.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page1_bg1.png b/view/yinmeng/activity/2024-lover/images/page1_bg1.png index 598ecfe..763107a 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page1_bg1.png and b/view/yinmeng/activity/2024-lover/images/page1_bg1.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page1_bg2.png b/view/yinmeng/activity/2024-lover/images/page1_bg2.png index 16c7c08..ef3501a 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page1_bg2.png and b/view/yinmeng/activity/2024-lover/images/page1_bg2.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page2Bg.png b/view/yinmeng/activity/2024-lover/images/page2Bg.png index 51c16c1..c6a8945 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page2Bg.png and b/view/yinmeng/activity/2024-lover/images/page2Bg.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page2But.png b/view/yinmeng/activity/2024-lover/images/page2But.png index 09a1a98..383ad8b 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page2But.png and b/view/yinmeng/activity/2024-lover/images/page2But.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page2Buy_icon.png b/view/yinmeng/activity/2024-lover/images/page2Buy_icon.png index 108814d..b8cdec1 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page2Buy_icon.png and b/view/yinmeng/activity/2024-lover/images/page2Buy_icon.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page2RuleTitle.png b/view/yinmeng/activity/2024-lover/images/page2RuleTitle.png index 9d3ef74..f67f9a6 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page2RuleTitle.png and b/view/yinmeng/activity/2024-lover/images/page2RuleTitle.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page2Title.png b/view/yinmeng/activity/2024-lover/images/page2Title.png index ff1bf6b..7277956 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page2Title.png and b/view/yinmeng/activity/2024-lover/images/page2Title.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Li.png b/view/yinmeng/activity/2024-lover/images/page3Li.png index a0f52c4..e11043b 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Li.png and b/view/yinmeng/activity/2024-lover/images/page3Li.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3RuleBg.png b/view/yinmeng/activity/2024-lover/images/page3RuleBg.png index 0834f76..ee1ecff 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3RuleBg.png and b/view/yinmeng/activity/2024-lover/images/page3RuleBg.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Rule_icon.png b/view/yinmeng/activity/2024-lover/images/page3Rule_icon.png index ce5a812..c1e25d8 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Rule_icon.png and b/view/yinmeng/activity/2024-lover/images/page3Rule_icon.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Rule_inBg.png b/view/yinmeng/activity/2024-lover/images/page3Rule_inBg.png index 34853d5..fea672d 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Rule_inBg.png and b/view/yinmeng/activity/2024-lover/images/page3Rule_inBg.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Title.png b/view/yinmeng/activity/2024-lover/images/page3Title.png index 12fb536..cead8b1 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Title.png and b/view/yinmeng/activity/2024-lover/images/page3Title.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Top1.png b/view/yinmeng/activity/2024-lover/images/page3Top1.png index dcd8d7c..96a699b 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Top1.png and b/view/yinmeng/activity/2024-lover/images/page3Top1.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Top2.png b/view/yinmeng/activity/2024-lover/images/page3Top2.png index ac88e7d..1c77104 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Top2.png and b/view/yinmeng/activity/2024-lover/images/page3Top2.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3Top3.png b/view/yinmeng/activity/2024-lover/images/page3Top3.png index c08df73..fc55481 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3Top3.png and b/view/yinmeng/activity/2024-lover/images/page3Top3.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3boxBg.png b/view/yinmeng/activity/2024-lover/images/page3boxBg.png index 5721b3d..b0583b8 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3boxBg.png and b/view/yinmeng/activity/2024-lover/images/page3boxBg.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3mp.png b/view/yinmeng/activity/2024-lover/images/page3mp.png index 225ee4e..1cd1d2b 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3mp.png and b/view/yinmeng/activity/2024-lover/images/page3mp.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3qp.png b/view/yinmeng/activity/2024-lover/images/page3qp.png index 64e3b37..886f43b 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3qp.png and b/view/yinmeng/activity/2024-lover/images/page3qp.png differ diff --git a/view/yinmeng/activity/2024-lover/images/page3ts.png b/view/yinmeng/activity/2024-lover/images/page3ts.png index ff08843..e733723 100644 Binary files a/view/yinmeng/activity/2024-lover/images/page3ts.png and b/view/yinmeng/activity/2024-lover/images/page3ts.png differ diff --git a/view/yinmeng/activity/2024-lover/images/pageTop3.png b/view/yinmeng/activity/2024-lover/images/pageTop3.png index c119425..8a645f5 100644 Binary files a/view/yinmeng/activity/2024-lover/images/pageTop3.png and b/view/yinmeng/activity/2024-lover/images/pageTop3.png differ diff --git a/view/yinmeng/activity/2024-lover/images/qp.png b/view/yinmeng/activity/2024-lover/images/qp.png index d9036dd..af7d9e1 100644 Binary files a/view/yinmeng/activity/2024-lover/images/qp.png and b/view/yinmeng/activity/2024-lover/images/qp.png differ diff --git a/view/yinmeng/activity/2024-lover/images/ruleTitle.png b/view/yinmeng/activity/2024-lover/images/ruleTitle.png index 4b24f9a..50dccbd 100644 Binary files a/view/yinmeng/activity/2024-lover/images/ruleTitle.png and b/view/yinmeng/activity/2024-lover/images/ruleTitle.png differ diff --git a/view/yinmeng/activity/2024-lover/images/sureTitle.png b/view/yinmeng/activity/2024-lover/images/sureTitle.png index 0e4bada..2d3aeaa 100644 Binary files a/view/yinmeng/activity/2024-lover/images/sureTitle.png and b/view/yinmeng/activity/2024-lover/images/sureTitle.png differ diff --git a/view/yinmeng/activity/2024-lover/images/tab1.png b/view/yinmeng/activity/2024-lover/images/tab1.png index 95da252..bd2967d 100644 Binary files a/view/yinmeng/activity/2024-lover/images/tab1.png and b/view/yinmeng/activity/2024-lover/images/tab1.png differ diff --git a/view/yinmeng/activity/2024-lover/images/tab2.png b/view/yinmeng/activity/2024-lover/images/tab2.png index 12e2bf8..c36962f 100644 Binary files a/view/yinmeng/activity/2024-lover/images/tab2.png and b/view/yinmeng/activity/2024-lover/images/tab2.png differ diff --git a/view/yinmeng/activity/2024-lover/images/tasks1.png b/view/yinmeng/activity/2024-lover/images/tasks1.png index 25435f2..3993b94 100644 Binary files a/view/yinmeng/activity/2024-lover/images/tasks1.png and b/view/yinmeng/activity/2024-lover/images/tasks1.png differ diff --git a/view/yinmeng/activity/2024-lover/images/tasks2.png b/view/yinmeng/activity/2024-lover/images/tasks2.png index ad7bbf5..70d2bc5 100644 Binary files a/view/yinmeng/activity/2024-lover/images/tasks2.png and b/view/yinmeng/activity/2024-lover/images/tasks2.png differ diff --git a/view/yinmeng/activity/2024-lover/images/top.png b/view/yinmeng/activity/2024-lover/images/top.png index ec158f0..020ef62 100644 Binary files a/view/yinmeng/activity/2024-lover/images/top.png and b/view/yinmeng/activity/2024-lover/images/top.png differ diff --git a/view/yinmeng/activity/2024-lover/index.html b/view/yinmeng/activity/2024-lover/index.html index 410a60f..718cd00 100644 --- a/view/yinmeng/activity/2024-lover/index.html +++ b/view/yinmeng/activity/2024-lover/index.html @@ -118,7 +118,7 @@ 活动期间送礼到达指定任务值,可解锁超珍稀限时礼物直购权 (1钻石送礼=1礼物值) -
${dateFormat(res.createTime, 'yyyy/MM/dd')}
+ ${dateFormat(res.createTime, 'hh/mm/ss')} +${dateFormat(res.createTime, 'yyyy/MM/dd')}
+ ${dateFormat(res.createTime, 'hh/mm/ss')} +