From 0a1514f7d988f1fe80e55b6ac96f3b6ae065f892 Mon Sep 17 00:00:00 2001 From: Dragon <13925835632@139.com> Date: Tue, 28 Mar 2023 18:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=A8=E6=88=BF=EF=BC=9A=E6=A6=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/peko/activity/act-ocean/css/index.css | 15 ++-- view/peko/activity/act-ocean/css/index.scss | 19 +++-- view/peko/common/js/common2.js | 4 +- .../modules/rule/js/newWishingWellRule.js | 85 +++++++++++++++++++ .../peko/modules/rule/newWishingWellRule.html | 48 +++++++++++ 5 files changed, 155 insertions(+), 16 deletions(-) create mode 100644 view/peko/modules/rule/js/newWishingWellRule.js create mode 100644 view/peko/modules/rule/newWishingWellRule.html diff --git a/view/peko/activity/act-ocean/css/index.css b/view/peko/activity/act-ocean/css/index.css index 4d415fb..7922ddf 100644 --- a/view/peko/activity/act-ocean/css/index.css +++ b/view/peko/activity/act-ocean/css/index.css @@ -834,24 +834,25 @@ body { } .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap { font-family: "pingfang-regular"; - width: 6.1333333333rem; + width: 5.8666666667rem; height: 0.9333333333rem; background-color: rgba(255, 255, 255, 0.3); border-radius: 0.48rem; margin: 0.2666666667rem auto 0.08rem; + display: flex; + overflow: hidden; + padding: 0.0666666667rem 0.1333333333rem; + box-sizing: border-box; + justify-content: space-between; } .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap span { display: inline-block; - width: 2.8rem; + width: 50%; height: 0.8rem; line-height: 0.8rem; text-align: center; font-size: 0.4rem; color: white; - margin-top: 0.0666666667rem; -} -.wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap span:first-child { - margin-left: 0.1866666667rem; } .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap .active { background-color: white; @@ -918,7 +919,7 @@ body { overflow: auto; position: absolute; width: 100%; - height: 6.9rem; + height: 7rem; padding: 0.4rem 0.2666666667rem 0; box-sizing: border-box; margin-top: 0.25rem; diff --git a/view/peko/activity/act-ocean/css/index.scss b/view/peko/activity/act-ocean/css/index.scss index 52ded78..2bb9ae9 100644 --- a/view/peko/activity/act-ocean/css/index.scss +++ b/view/peko/activity/act-ocean/css/index.scss @@ -1098,25 +1098,30 @@ body { .tab-wrap { font-family: 'pingfang-regular'; - width: px2rem(460); + width: px2rem(440); height: px2rem(70); background-color: rgba($color: #fff, $alpha: .3); border-radius: px2rem(36); margin: px2rem(20) auto px2rem(6); + display: flex; + overflow: hidden; + padding: px2rem(5, ) px2rem(10, ); + box-sizing: border-box; + justify-content: space-between; span { display: inline-block; - width: px2rem(210); + // width: px2rem(210, ); + width: 50%; height: px2rem(60); line-height: px2rem(60); text-align: center; font-size: px2rem(30); color: white; - margin-top: px2rem(5); - &:first-child { - margin-left: px2rem(14); - } + // &:first-child { + // margin-left: px2rem(14); + // } } .active { @@ -1199,7 +1204,7 @@ body { overflow: auto; position: absolute; width: 100%; - height: 6.9rem; + height: 7rem; // background-color: white; padding: px2rem(30) px2rem(20) 0; box-sizing: border-box; diff --git a/view/peko/common/js/common2.js b/view/peko/common/js/common2.js index ee2fee8..085e209 100644 --- a/view/peko/common/js/common2.js +++ b/view/peko/common/js/common2.js @@ -541,8 +541,8 @@ function getInfoFromClient () { } else { // 非app环境调试参数 - pubInfo.uid = 0; - pubInfo.ticket = ""; + pubInfo.uid = 2524; + pubInfo.ticket = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjoyNTI0LCJ0aWNrZXRfaWQiOiIyMTdmYjU3ZC1jZDlhLTRmY2MtOTFiZS0xNjUwNTIxNTIyOTgiLCJleHAiOjM2MDAsImNsaWVudF9pZCI6ImVyYmFuLWNsaWVudCJ9.5vg2KI8Jw9ale_DmqJdr8eq1dl34Vw0OK_aSrb8hdsY"; // pubInfo.uid = ""; // pubInfo.ticket = ""; diff --git a/view/peko/modules/rule/js/newWishingWellRule.js b/view/peko/modules/rule/js/newWishingWellRule.js new file mode 100644 index 0000000..22f9ffb --- /dev/null +++ b/view/peko/modules/rule/js/newWishingWellRule.js @@ -0,0 +1,85 @@ +let urlPrefix = getUrlPrefix() +getInfoFromClient() + +// 封装layer消息提醒框 +let layerIndex +const showLoading = (content = '加載中...') => { + layer.open({ + type: 2, + shadeClose: false, + content, + success(e) { + layerIndex = $(e).attr('index') + } + }) +} +const hideLoading = (index) => { + layer.close(index) +} +const toastMsg = (content = '操作完成', time = 2) => { + layer.open({ + content, + time, + skin: 'msg' + }) +} + +let wishingWellList = [] +const getData = (boxType = 2) => { + showLoading() + networkRequest({ + type: 'GET', + url: urlPrefix + '/findLove/rule', + data: { + boxType + }, + success(res){ + hideLoading(layerIndex) + if(res.code === 200){ + wishingWellList = res.data + renderList() + }else{ + toastMsg(res.message) + } + }, + error(){ + hideLoading(layerIndex) + toastMsg('網絡錯誤') + } + }) +} + +const renderList = () => { + let str = '' + wishingWellList.map(item => { + str += ` +
  • + +
    +

    ${item.rewardName}

    +

    ${item.diamonds} 

    +
    + ${item.rate.toFixed(2)}% +
    • + ` + $('ul').html(str) + }) +} + +$(function () { + setTimeout(() => { + getData() + }, 50) + let currentIndex = 0 + $('.tab').on('click', 'div', function(){ + let index = $(this).index() + if(index === currentIndex) return; + $(this).addClass('active').siblings('div').removeClass('active') + if(index){ + getData(7) + }else{ + getData(2) + } + currentIndex = index + }) +}) \ No newline at end of file diff --git a/view/peko/modules/rule/newWishingWellRule.html b/view/peko/modules/rule/newWishingWellRule.html new file mode 100644 index 0000000..c9fb1c7 --- /dev/null +++ b/view/peko/modules/rule/newWishingWellRule.html @@ -0,0 +1,48 @@ + + + + + + + + + + + 玩法规则 + + + + +
    +

    + 1 + 從尋愛之旅處獲得的禮物放到禮物包裹，點開禮物面板即可查看； +

    +

    + 2 + 每次在尋找之旅100%獲得禮物。 +

    +
    + +
    +
    + 尋愛之旅 + +
    +
    + 梦幻许愿池（限时开放） + +
    +
    + + + + + + + + + + + \ No newline at end of file