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礼物值) -
+
@@ -137,7 +137,7 @@ 1314购买
-
+
@@ -165,10 +165,10 @@
突破热恋值,领取限时装扮奖励! - 收礼方将获得粉色装扮,送礼方则获得蓝色装扮 - 奖励自动发放至「我的装扮」 + 女性用户获得粉色装扮,男性用户获得蓝色装扮 + 每个用户仅能获取1次,将自动发放至「我的装扮」 -
+
@@ -200,8 +200,8 @@ 0/1000
-
- 已完成 +
+ 未完成
@@ -310,8 +310,13 @@
  • d. 购买的礼物将直接放入背包当中
  • 3. 热恋时刻
  • a. 活动时间:2月14日0:00:00—2月14日23:59:59
  • -
  • b. 活动时间内,比拼热恋值(收到10钻=1热恋值)
  • -
  • c. 活动时间内,热恋值满
  • +
  • b. 活动时间内,比拼热恋值(收到1钻=1热恋值)
  • +
  • c. 活动时间内,热恋值满13140,可获得24H【糖果恋人】头像框奖励;热恋值满33440,可获得24H【糖果恋人】气泡奖励
  • +
  • d. 大头号(牌照房房主)和家族长不可以组成CP,不参与榜单活动排名
  • +
  • e. 榜单奖励:TOP1可额外获得情侣靓号5203344&3344520*30天;TOP1-3均可获得【挚爱唯一】专属铭牌、头像框、资料卡、专属开屏1天
  • +
  • 三、特别说明
  • +
  • 1.靓号持有者需要在活动结束后2周内确认靓号,否则将自动过期无法使用
  • +
  • 2.本活动最终解释权归音萌所有,本活动以及奖励与苹果公司无关;
  • diff --git a/view/yinmeng/activity/2024-lover/js/index.js b/view/yinmeng/activity/2024-lover/js/index.js index 011029e..73606da 100644 --- a/view/yinmeng/activity/2024-lover/js/index.js +++ b/view/yinmeng/activity/2024-lover/js/index.js @@ -26,7 +26,15 @@ const toastMsg = (content = '操作完成', time = 2) => { skin: 'msg' }) } - +var activityCode1; +var activityCode2; +var activityCode; +var diamondNum; +var taskCode; +var taskIcon; +var taskName; +var showValue; +var countupTime; // 初始化函数 $(function () { getInfoFromClient() @@ -47,32 +55,85 @@ $(function () { window.webkit.messageHandlers.closeWebView.postMessage(null) } }) - getTask(); + getTask_MENG_DONG_HUA_HE(); + getTask_TIAN_MI_SHENG_WEN(); + getRank(); }, 100) }) -// 获取任务接口 -function getTask () { +// 获取榜单接口 +function getRank () { showLoading() networkRequest({ type: 'get', - url: urlPrefix + '/activity/task/user', - data: { componentCode: 1 }, + url: urlPrefix + '/act/2024Valentines/cpRank/getRank', success (res) { if (res.code === 200) { - // 渲染合成列表 - $('.page1 .bg1 .giftListBox .giftList').remove(); - var str = ''; - res.data.forEach((res, i) => { - str += ` -
    -
    - -
    ${res.taskName}
    -
    ${res.showValue}钻
    -
    - ` + // 处理任务 + res.data.cpTaskList.forEach((val, i) => { + console.log(res.status); + if (val.status == 2) { + $(`.page3 .box .tasks${i + 1} .buy`).addClass("act"); + $(`.page3 .box .tasks${i + 1} .buy`).text("已完成"); + $(`.page3 .box .tasks${i + 1} .line .i`).text(`${res.data.score > val.score ? val.score : res.data.score}/${val.score}`); + $(`.page3 .box .tasks${i + 1} .line span`).css('width', `${(res.data.score / val.score) * 100 >= 100 ? 98.8 : (res.data.score / val.score) * 100}%`) + } else { + $(`.page3 .box .tasks${i + 1} .buy`).removeClass("act"); + $(`.page3 .box .tasks${i + 1} .buy`).text("未完成"); + $(`.page3 .box .tasks${i + 1} .line .i`).text(`${res.data.score > val.score ? val.score : res.data.score}/${val.score}`); + $(`.page3 .box .tasks${i + 1} .line span`).css('width', `${(res.data.score / val.score) * 100 >= 100 ? 98.8 : (res.data.score / val.score) * 100}%`) + } }); - $('.page1 .bg1 .giftListBox').append(str); + // 处理前三 + var top3 = res.data.rankList.slice(0, 3); + var notTop3 = res.data.rankList.slice(3); + if (top3.length < 3) { + let arr = new Array(3 - top3.length).fill({ + leftAvatar: './images/logo.png', + rightAvatar: './images/logo.png', + leftNick: '虚位以待', + rightNick: '虚位以待', + score: "0" + }) + top3.push(...arr) + } + top3.forEach((res, i) => { + $(`.page3 .top3 .no${i + 1} .leftlogo`).attr('src', res.leftAvatar); + $(`.page3 .top3 .no${i + 1} .rightlogo`).attr('src', res.rightAvatar); + $(`.page3 .top3 .no${i + 1} .name`).html(`${res.leftNick.length > 6 ? res.leftNick.slice(0, 6) + '...' : res.leftNick} & ${res.rightNick.length > 6 ? res.rightNick.slice(0, 6) + '...' : res.rightNick}`); + $(`.page3 .top3 .no${i + 1} .score`).text(unitProcessing(res.score, 10000, 1, 'w') + '热恋值') + }) + // 非前三 + var str = ''; + $('.page3 ul li').remove(); + notTop3.forEach((res, i) => { + str += ` +
  • +
    ${res.ranking}
    + + +
    ${res.leftNick}
    +
    ${res.rightNick}
    +
    ${unitProcessing(res.score, 10000, 1, 'w')}
    +
  • + ` + }) + $('.page3 ul').append(str); + // 处理自己榜单排名 + $('.page3 .my .myBox').remove(); + var strMy = ''; + res.data.meRankList.forEach((res, i) => { + strMy += ` +
    +
    ${res.ranking == 0 ? '未上榜' : res.ranking}
    + + +
    ${res.leftNick}
    +
    ${res.rightNick}
    +
    ${unitProcessing(res.score, 10000, 1, 'w')}
    +
    + ` + }) + $('.page3 .my .scroll').append(strMy) } else { toastMsg(res.message) } @@ -84,17 +145,275 @@ function getTask () { } }) } +// 获取萌动礼盒点亮任务接口 +function activityInfo () { + showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/activity/info', + data: { activityCode: activityCode2 }, + success (res) { + if (res.code === 200) { + if (res.data.endTime - res.timestamp > 0) { + countup(res.data.endTime - res.timestamp); + } else { + $('.end').show(); + bodyScroolFun(true); + } + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error (err) { + hideLoading(layerIndex) + toastMsg('网络错误,请退出重进') + } + }) +} +// 倒计时 +function countup (leftTime) { + clearTimeout(countupTime) + //获取当前时间 + // var now = nowTime; + var d = 0; + var h = 0; + var m = 0; + var s = 0; + //定义变量 d,h,m,s保存倒计时的时间 + var d, h, m, s; + //递归每秒调⽤countTime⽅法,显⽰动态时间效果 + if (leftTime > 0) { + d = getzf(Math.floor(leftTime / 1000 / 60 / 60 / 24)); + h = getzf(Math.floor(leftTime / 1000 / 60 / 60 % 24)); + m = getzf(Math.floor(leftTime / 1000 / 60 % 60)); + s = getzf(Math.floor(leftTime / 1000 % 60)); + //将倒计时赋值到div中 + $('.page2 .box .i1').text(`剩余时间:${d}天${h}时${m}分${s}秒`); + } else { + $('.page2 .box .i1').text(`剩余时间:已结束`); + + } + if (leftTime > 0) { + leftTime = leftTime - 1000; + } + countupTime = setTimeout(function () { + countup(leftTime); + }, 1000); +} +// 获取萌动礼盒点亮任务接口 +function getTask_MENG_DONG_HUA_HE () { + showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/activity/task/user', + data: { componentCode: "MENG_DONG_HUA_HE" }, + success (res) { + if (res.code === 200) { + // 渲染合成列表 + $('.page1 .bg1 .giftListBox .giftList').remove(); + var str = ''; + res.data[0].children.forEach((res, i) => { + str += ` +
    +
    + +
    ${res.taskName}
    +
    ${res.taskValue}钻
    +
    + ` + }); + $('.page1 .bg1 .giftListBox').append(str); + activityCode1 = 'ACT_2024_VALENTINES_DAY'; + recordPage(activityCode1, 'MENG_DONG_HUA_HE',); + if (res.data[0].reward.granted) { + $('.page1 .bg1 .p3').show(); + } else { + $('.page1 .bg1 .p3').hide(); + } + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error (err) { + hideLoading(layerIndex) + toastMsg('网络错误,请退出重进') + } + }) +} +// 获取甜蜜升温任务接口 +function getTask_TIAN_MI_SHENG_WEN () { + showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/activity/task/user', + data: { componentCode: "TIAN_MI_SHENG_WEN" }, + success (res) { + if (res.code === 200) { + activityCode2 = 'ACT_2024_VALENTINES_DAY'; + res.data.forEach((res, i) => { + $(`.page2 .box .tasks${i + 1} .giftBox .gift`).attr('src', res.taskIcon); + $(`.page2 .box .tasks${i + 1} .giftBox .giftName`).text(res.reward.rewardName); + $(`.page2 .box .tasks${i + 1} .giftBox .giftVAlue`).text(res.reward.showValue + '钻'); + $(`.page2 .box .tasks${i + 1} .p1`).text(`每达到${res.taskValue}礼物值,可解锁1次直购权`); + $(`.page2 .box .tasks${i + 1} .line .i`).text(`${res.completeValue % res.taskValue}/${res.taskValue}`); + $(`.page2 .box .tasks${i + 1} .line span`).css('width', `${(res.completeValue % res.taskValue / res.taskValue) * 100 >= 100 ? 98.8 : (res.completeValue % res.taskValue / res.taskValue) * 100}%`); + $(`.page2 .box .tasks${i + 1} .p3`).text(`当前可购买: ${Math.floor(res.activityValue / res.taskValue)}个`); + $(`.page2 .box .tasks${i + 1} .buy`).html(` + ${res.reward.showValue}购买`); + $(`.page2 .box .tasks${i + 1} .buy`).attr('activityCode', res.activityCode); + $(`.page2 .box .tasks${i + 1} .buy`).attr('taskCode', res.taskCode); + $(`.page2 .box .tasks${i + 1} .buy`).attr('diamondNum', res.reward.showValue); + $(`.page2 .box .tasks${i + 1} .buy`).attr('num', Math.floor(res.activityValue / res.taskValue)); + $(`.page2 .box .tasks${i + 1} .buy`).attr('taskIcon', res.taskIcon); + $(`.page2 .box .tasks${i + 1} .buy`).attr('taskName', res.reward.rewardName); + $(`.page2 .box .tasks${i + 1} .buy`).attr('showValue', res.reward.showValue); + }) + activityInfo(); + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error (err) { + hideLoading(layerIndex) + toastMsg('网络错误,请退出重进') + } + }) +} +// 购买接口 +function exchange (activityCode, diamondNum, taskCode, taskIcon, taskName, showValue) { + showLoading() + networkRequest({ + type: 'post', + url: urlPrefix + '/activity/task/exchange', + data: { activityCode, diamondNum, taskCode, num: 1 }, + success (res) { + if (res.code === 200) { + $('.success .success_in .giftListSuccess .gift').attr('src', taskIcon); + $('.success .success_in .giftListSuccess .giftName').text(taskName); + $('.success .success_in .giftListSuccess .giftVAlue').text(`${showValue}钻`); + $('.success .success_in .text').text(`${taskName}*1已发放至「我的背包」`); + $('.success').show(); + getTask_TIAN_MI_SHENG_WEN(); + bodyScroolFun(true); + } else if (res.code == 31005) { + $('.failureBuy').show(); + bodyScroolFun(true); + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error (err) { + hideLoading(layerIndex) + toastMsg('网络错误,请退出重进') + } + }) +} +// 购买礼物按钮 +$(`.page2 .box .taskss .buy`).click(function () { + var num = $(this).attr('num'); + activityCode = $(this).attr('activityCode'); + diamondNum = $(this).attr('diamondNum'); + taskCode = $(this).attr('taskCode'); + taskIcon = $(this).attr('taskIcon'); + taskName = $(this).attr('taskName'); + showValue = $(this).attr('showValue'); + if (num > 0) {//true + $('.sure .sure_in .giftListSuccess .gift').attr('src', taskIcon); + $('.sure .sure_in .giftListSuccess .giftName').text(taskName); + $('.sure .sure_in .giftListSuccess .giftVAlue').text(showValue + '钻'); + $('.sure').show(); + bodyScroolFun(true); + } else { + toastMsg('当前购买次数不足~') + } +}); +// 二次确认弹窗 +$('.sure .sure_in .ok').click(function () { + exchange(activityCode, diamondNum, taskCode, taskIcon, taskName, showValue); + $('.sure').hide(); + bodyScroolFun(false); +}) // tab切换 $('.tab div').click(function () { - var i = $(this).index() + 1; var i = $(this).index() + 1; $('.page1,.page2,.page3').hide(); $(`.page${i}`).show(); $(this).addClass(`act`).siblings().removeClass('act') + if (i == 3) { + getRank(); + } }) - +// 记录接口 +function recordPage (activityCode, componentCode) { + showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/activity/task/user/record/page', + data: { activityCode, componentCode, pageNum: 1, pageSize: 9999 }, + success (res) { + if (res.code === 200) { + var str = ''; + if (componentCode == 'MENG_DONG_HUA_HE') { + $('.page1 .bg2 ul li').remove() + if (res.data.records.length <= 0) { + str = `
  • 暂无点亮记录,快去集齐礼物吧~
  • ` + } else { + res.data.records.forEach(res => { + str += ` +
  • +
    点亮时间
    +
    获得奖励
    +
  • +
  • +
    +

    ${dateFormat(res.createTime, 'yyyy/MM/dd')}

    + ${dateFormat(res.createTime, 'hh/mm/ss')} +
    +
    ${res.rewardName}铭牌
    +
  • + `}) + } + $('.page1 .bg2 ul').append(str); + } else if (componentCode == 'TIAN_MI_SHENG_WEN') { + $('.buyRecords .buyRecords_in ul li').remove(); + if (res.data.records.length <= 0) { + str = `
  • 暂无购买记录~
  • ` + } else { + res.data.records.forEach(res => { + str += ` +
  • +
    购买时间
    +
    购买礼物
    +
  • +
  • +
    +

    ${dateFormat(res.createTime, 'yyyy/MM/dd')}

    + ${dateFormat(res.createTime, 'hh/mm/ss')} +
    +
    ${res.rewardName}礼物*1个
    +
  • + `}) + } + $('.buyRecords .buyRecords_in ul').append(str); + } + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error (err) { + hideLoading(layerIndex) + toastMsg('网络错误,请退出重进') + } + }) +} // 打开购买记录 $('.page2 .box .page2Buy_icon').click(function () { + recordPage(activityCode2, 'TIAN_MI_SHENG_WEN',); $('.buyRecords').show(); bodyScroolFun(true); }) @@ -137,6 +456,10 @@ $('.page3 .my .icon').click(function () { // 关闭活动结束弹窗 $('.end .end_in .but').click(function () { + $('.page1,.page2,.page3').hide(); + $(`.page${3}`).show(); + $('.tab div').removeClass('act'); + $('.tab div').eq(2).addClass('act'); $('.end').hide(); bodyScroolFun(false); }) @@ -148,7 +471,7 @@ $('.failureBuy .failureBuy_in .close').click(function () { }) // 跳转充值弹窗 -$('.failureBuy .failureBuy_in .close').click(function () { +$('.failureBuy .failureBuy_in .ok').click(function () { $('.failureBuy').hide(); bodyScroolFun(false); if (browser.android) { @@ -171,12 +494,6 @@ $('.sure .sure_in .close').click(function () { bodyScroolFun(false); }) -// 二次确认弹窗 -$('.sure .sure_in .ok').click(function () { - $('.sure').hide(); - bodyScroolFun(false); -}) - // 关闭榜单奖励 $('.page3Rule').click(function () { $('.page3Rule').hide(); @@ -187,4 +504,12 @@ $('.page3Rule').click(function () { $('.page3 .top3 .rule_icon').click(function () { $('.page3Rule').show(); bodyScroolFun(true); -}) \ No newline at end of file +}) + +//补0操作 +function getzf (num) { + if (parseInt(num) < 10) { + num = '0' + num; + } + return num; +} \ No newline at end of file