diff --git a/view/peko/activity/act-2023-qx/css/index.css b/view/peko/activity/act-2023-qx/css/index.css index c054333..92917e7 100644 --- a/view/peko/activity/act-2023-qx/css/index.css +++ b/view/peko/activity/act-2023-qx/css/index.css @@ -43,7 +43,7 @@ body { line-height: 0.6133333333rem; text-align: center; position: absolute; - top: 0.8666666667rem; + top: 6rem; right: 0; color: #F8F3FC; font-size: 0.3466666667rem; @@ -213,6 +213,22 @@ body { transform: translateX(-50%); top: 0.2rem; } +.page1 .magpieBridge .leftRen { + width: 1.2266666667rem; + height: 2.04rem; + position: absolute; + top: 2.0133333333rem; + left: 10%; + z-index: 2; +} +.page1 .magpieBridge .rightRen { + width: 1.2266666667rem; + height: 2.04rem; + position: absolute; + top: 2.0133333333rem; + right: 10%; + z-index: 2; +} .page1 .magpieBridge .xiques { width: 8.9066666667rem; height: 6.5466666667rem; @@ -220,6 +236,7 @@ body { left: 50%; transform: translateX(-50%); top: 0.2rem; + z-index: 2; } .page1 .magpieBridge .xiques .xique { width: 100%; diff --git a/view/peko/activity/act-2023-qx/css/index.scss b/view/peko/activity/act-2023-qx/css/index.scss index 7ea4d6a..cb00b4d 100644 --- a/view/peko/activity/act-2023-qx/css/index.scss +++ b/view/peko/activity/act-2023-qx/css/index.scss @@ -52,7 +52,7 @@ body { line-height: px2rem(46, ); text-align: center; position: absolute; - top: px2rem(65, ); + top: 6rem; right: 0; color: #F8F3FC; font-size: px2rem(26, ); @@ -245,6 +245,24 @@ body { top: px2rem(15, ); } + .leftRen { + width: px2rem(92, ); + height: px2rem(153, ); + position: absolute; + top: px2rem(151, ); + left: 10%; + z-index: 2; + } + + .rightRen { + width: px2rem(92, ); + height: px2rem(153, ); + position: absolute; + top: px2rem(151, ); + right: 10%; + z-index: 2; + } + .xiques { width: px2rem(668, ); height: px2rem(491, ); @@ -252,6 +270,7 @@ body { left: 50%; transform: translateX(-50%); top: px2rem(15, ); + z-index: 2; .xique { width: 100%; diff --git a/view/peko/activity/act-2023-qx/images/11.png b/view/peko/activity/act-2023-qx/images/11.png new file mode 100644 index 0000000..0e4f6ee Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/11.png differ diff --git a/view/peko/activity/act-2023-qx/images/2.png b/view/peko/activity/act-2023-qx/images/2.png new file mode 100644 index 0000000..7d3923b Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/2.png differ diff --git a/view/peko/activity/act-2023-qx/images/3.png b/view/peko/activity/act-2023-qx/images/3.png new file mode 100644 index 0000000..6fcb0d9 Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/3.png differ diff --git a/view/peko/activity/act-2023-qx/images/4.png b/view/peko/activity/act-2023-qx/images/4.png new file mode 100644 index 0000000..178b075 Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/4.png differ diff --git a/view/peko/activity/act-2023-qx/images/5.png b/view/peko/activity/act-2023-qx/images/5.png new file mode 100644 index 0000000..0adf0fc Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/5.png differ diff --git a/view/peko/activity/act-2023-qx/images/6.png b/view/peko/activity/act-2023-qx/images/6.png new file mode 100644 index 0000000..5aeb973 Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/6.png differ diff --git a/view/peko/activity/act-2023-qx/images/blessingBag.png b/view/peko/activity/act-2023-qx/images/blessingBag.png index 8e828ab..1d21956 100644 Binary files a/view/peko/activity/act-2023-qx/images/blessingBag.png and b/view/peko/activity/act-2023-qx/images/blessingBag.png differ diff --git a/view/peko/activity/act-2023-qx/images/leftRen.png b/view/peko/activity/act-2023-qx/images/leftRen.png new file mode 100644 index 0000000..249567a Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/leftRen.png differ diff --git a/view/peko/activity/act-2023-qx/images/magpieBridgeBg2.png b/view/peko/activity/act-2023-qx/images/magpieBridgeBg2.png new file mode 100644 index 0000000..343e5b8 Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/magpieBridgeBg2.png differ diff --git a/view/peko/activity/act-2023-qx/images/rightRen.png b/view/peko/activity/act-2023-qx/images/rightRen.png new file mode 100644 index 0000000..5d1439d Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/rightRen.png differ diff --git a/view/peko/activity/act-2023-qx/images/roomRule.png b/view/peko/activity/act-2023-qx/images/roomRule.png index 3154d13..f2eeef3 100644 Binary files a/view/peko/activity/act-2023-qx/images/roomRule.png and b/view/peko/activity/act-2023-qx/images/roomRule.png differ diff --git a/view/peko/activity/act-2023-qx/images/rule_pub_in.png b/view/peko/activity/act-2023-qx/images/rule_pub_in.png index 6d72f1d..499c976 100644 Binary files a/view/peko/activity/act-2023-qx/images/rule_pub_in.png and b/view/peko/activity/act-2023-qx/images/rule_pub_in.png differ diff --git a/view/peko/activity/act-2023-qx/images/sts.png b/view/peko/activity/act-2023-qx/images/sts.png new file mode 100644 index 0000000..8397e9c Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/sts.png differ diff --git a/view/peko/activity/act-2023-qx/images/sweet2.png b/view/peko/activity/act-2023-qx/images/sweet2.png new file mode 100644 index 0000000..c938a6b Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/sweet2.png differ diff --git a/view/peko/activity/act-2023-qx/images/sweet_in.png b/view/peko/activity/act-2023-qx/images/sweet_in.png deleted file mode 100644 index cdf7628..0000000 Binary files a/view/peko/activity/act-2023-qx/images/sweet_in.png and /dev/null differ diff --git a/view/peko/activity/act-2023-qx/images/sweet_in1.png b/view/peko/activity/act-2023-qx/images/sweet_in1.png new file mode 100644 index 0000000..05d424b Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/sweet_in1.png differ diff --git a/view/peko/activity/act-2023-qx/images/sweet_in2.png b/view/peko/activity/act-2023-qx/images/sweet_in2.png new file mode 100644 index 0000000..6be1cc3 Binary files /dev/null and b/view/peko/activity/act-2023-qx/images/sweet_in2.png differ diff --git a/view/peko/activity/act-2023-qx/images/task2.png b/view/peko/activity/act-2023-qx/images/task2.png index 9004797..ccb5c8b 100644 Binary files a/view/peko/activity/act-2023-qx/images/task2.png and b/view/peko/activity/act-2023-qx/images/task2.png differ diff --git a/view/peko/activity/act-2023-qx/index.html b/view/peko/activity/act-2023-qx/index.html index 5bb2a41..e8baadf 100644 --- a/view/peko/activity/act-2023-qx/index.html +++ b/view/peko/activity/act-2023-qx/index.html @@ -49,54 +49,54 @@
+ + + + - +
@@ -135,7 +139,7 @@
- + 鵲仙橋頭飾*3天
@@ -286,7 +290,7 @@
活動規則
-

贈送普通禮物1鉆石=1情緣值,七夕限定禮物1鉆石=3情緣值

+

贈送普通禮物10鉆石=1情緣值,七夕限定禮物10鉆石=3情緣值

@@ -432,7 +436,7 @@
- +
diff --git a/view/peko/activity/act-2023-qx/js/index.js b/view/peko/activity/act-2023-qx/js/index.js index 9c85284..9ed7ca8 100644 --- a/view/peko/activity/act-2023-qx/js/index.js +++ b/view/peko/activity/act-2023-qx/js/index.js @@ -40,6 +40,7 @@ var redLineNum = 0;//紅繩數量 var page = 1;//頁碼 var pageSizeLack = true;// 下拉更多鎖 var lack = true;// 抽獎鎖 +var timeEndLock = true; // 初始化函數 $(function () { setTimeout(function () { @@ -76,6 +77,11 @@ function getConfig () { data: {}, success (res) { if (res.code === 200) { + // 判断活动结束时间 + if (res.timestamp > res.data.endTime) { + timeEndLock = false; + $('.endActivity').show(); + } // 處理活動時間 $('.header .titleHeader').text(`活動時間:${dateFormat(res.data.startTime, 'yyyy年MM月dd日')}-${dateFormat(res.data.endTime, 'yyyy年MM月dd日')}`) // 當前用戶喜鵲 @@ -84,6 +90,28 @@ function getConfig () { // 處理當前喜鵲進度狀態值 var curXiqueNums = res.data.serverCurXiqueNum / res.data.serverMaxXiqueNum * 100; $('.page1 .magpieBridge .line .line_in').css('width', curXiqueNums >= 100 ? '100%' : `${curXiqueNums}%`); + if (curXiqueNums < 20) { + $('.page1 .magpieBridge .leftRen').css('left', '10%'); + } else if (curXiqueNums >= 20 && curXiqueNums < 40) { + $('.page1 .magpieBridge .leftRen').css('left', '17.5%'); + } else if (curXiqueNums >= 40 && curXiqueNums < 60) { + $('.page1 .magpieBridge .leftRen').css('left', '25%'); + } else if (curXiqueNums >= 60 && curXiqueNums < 80) { + $('.page1 .magpieBridge .leftRen').css('left', '32.5%'); + } else if (curXiqueNums >= 100) { + $('.page1 .magpieBridge .leftRen').css('left', '40%'); + } + if (curXiqueNums < 20) { + $('.page1 .magpieBridge .rightRen').css('right', '10%'); + } else if (curXiqueNums >= 20 && curXiqueNums < 40) { + $('.page1 .magpieBridge .rightRen').css('right', '16.75%'); + } else if (curXiqueNums >= 40 && curXiqueNums < 60) { + $('.page1 .magpieBridge .rightRen').css('right', '23.5%'); + } else if (curXiqueNums >= 60 && curXiqueNums < 80) { + $('.page1 .magpieBridge .rightRen').css('right', '30.25%'); + } else if (curXiqueNums >= 100) { + $('.page1 .magpieBridge .rightRen').css('right', '37%'); + } // 處理領取喜鵲頭飾按鈕狀態 if (res.data.devotedBtnStatus == 0) {//投入按鈕狀態(0=可投入,1=可領取,2=不能領取,-1=已領取) $('.page1 .magpieBridge .buting').hide(); @@ -136,7 +164,7 @@ function getRecommendRoom () { showLoading() networkRequest({ type: 'GEt', - url: urlPrefix + '/tab/home/one', + url: urlPrefix + '/home/tab/home/one', data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid }, success (res) { if (res.code === 200) { @@ -362,7 +390,7 @@ function swiperFun () { direction: "vertical", loop: true, autoplay: { - delay: 2000,//3秒切換一次 + delay: 3500,//3秒切換一次 disableOnInteraction: false } }) @@ -370,6 +398,9 @@ function swiperFun () { // 總tab切換 $('.tabs div').click(function () { var i = $(this).index() + 1; + if (i == 1 && timeEndLock == false || i == 2 && timeEndLock == false) { + return toastMsg('活動已結束') + } $('.tabs').removeClass('tab1').removeClass('tab2').removeClass('tab3').removeClass('tab4'); $('.tabs').addClass(`tab${i}`); $('.page1').hide(); @@ -748,12 +779,18 @@ $('.page4 .page4Tab div').click(function () { getRank(data, rankType); $('.page4 .page4Tab').removeClass('page4Tab2'); type = 'a'; + $('.page4 .giftVal').text('收到普通禮物10鉆石=1甜蜜值,七夕限定禮物10鉆石=3甜蜜值'); + $('.page4 .sweet .sweet_in .box img').attr('src','./images/sweet_in1.png'); + $('.page4 .sweet .sweet_in').css({'background':'url(./images/sweet.png) no-repeat',"background-size":'100% 100%'}); } else { rankType = 3; data = null; getRank(data, rankType); $('.page4 .page4Tab').addClass('page4Tab2'); type = 'b'; + $('.page4 .sweet .sweet_in .box img').attr('src','./images/sweet_in2.png'); + $('.page4 .giftVal').text('收到普通禮物10鉆石=1心动值,七夕限定禮物10鉆石=3心动值'); + $('.page4 .sweet .sweet_in').css({'background':'url(./images/sweet2.png) no-repeat',"background-size":'100% 100%'}); } }) // 七夕榜單日榜總榜切換 @@ -783,6 +820,14 @@ $('.page4 .timeList div').click(function () { }) // 關閉活動結束按鈕 $('.endActivity .endActivity_in .but').click(function () { + $('.tabs').removeClass('tab1').removeClass('tab2').removeClass('tab3').removeClass('tab4'); + $('.tabs').addClass(`tab${3}`); + $('.page1').hide(); + $('.page2').hide(); + $('.page3').hide(); + $('.page4').hide(); + $(`.page${3}`).show(); + getRoomRank(); $('.endActivity').hide(); bodyScroolFun(false); }) @@ -827,7 +872,10 @@ function devotedXique (num) { if (res.code === 200) { getConfig(); toastMsg('投放成功') - xiqueBut = true; + svgaFun(); + setTimeout(function () { + xiqueBut = true; + }, 2000) } else { toastMsg(res.message) xiqueBut = true; @@ -867,10 +915,7 @@ $('.page1 .magpieBridge .but1,.page1 .magpieBridge .but10').click(function () { } if (xiqueBut) { xiqueBut = false; - svgaFun(); - setTimeout(function () { - devotedXique(1); - }, 2000) + devotedXique(1); } } else { @@ -880,10 +925,7 @@ $('.page1 .magpieBridge .but1,.page1 .magpieBridge .but10').click(function () { } if (xiqueBut) { xiqueBut = false; - svgaFun(); - setTimeout(function () { - devotedXique(10); - }, 2000) + devotedXique(10); } // devotedXique(10); } @@ -915,7 +957,7 @@ $('.page1 .task .box1 .task3 .but').click(function () { } }) // 循環任務按鈕 -$('.page1 .tasks2 .box2 .task2But').click(function(){ +$('.page1 .task .box2 .task2But').click(function () { if (browser.ios) { window.webkit.messageHandlers.openRoomForGiftId.postMessage(JSON.stringify({ uid: roomUid, giftId: giftId })) } else if (browser.android) {