新增留意活动

修复热恋活动bug
新增热恋全城活动
2024-05-28 21:24:28 +08:00 · 2024-05-16 17:27:29 +08:00 · 2024-05-15 19:09:00 +08:00 · 2024-04-25 18:20:32 +08:00 · 2024-04-19 14:15:21 +08:00
100 changed files with 4790 additions and 4 deletions
--- a/view/yinmeng/activity/2024-childrenDay/css/index.css
+++ b/view/yinmeng/activity/2024-childrenDay/css/index.css
--- a/view/yinmeng/activity/2024-childrenDay/css/index.scss
+++ b/view/yinmeng/activity/2024-childrenDay/css/index.scss
--- a/view/yinmeng/activity/2024-childrenDay/css/swiper-bundle.min.css
+++ b/view/yinmeng/activity/2024-childrenDay/css/swiper-bundle.min.css
--- a/view/yinmeng/activity/2024-childrenDay/images/but_icon.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/but_icon.png
--- a/view/yinmeng/activity/2024-childrenDay/images/close.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/close.png
--- a/view/yinmeng/activity/2024-childrenDay/images/gameBg.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/gameBg.png
--- a/view/yinmeng/activity/2024-childrenDay/images/gift1.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/gift1.png
--- a/view/yinmeng/activity/2024-childrenDay/images/gift2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/gift2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/gift3.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/gift3.png
--- a/view/yinmeng/activity/2024-childrenDay/images/giftBox.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/giftBox.png
--- a/view/yinmeng/activity/2024-childrenDay/images/giftBoxs.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/giftBoxs.png
--- a/view/yinmeng/activity/2024-childrenDay/images/header.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/header.png
--- a/view/yinmeng/activity/2024-childrenDay/images/icon1.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/icon1.png
--- a/view/yinmeng/activity/2024-childrenDay/images/icon2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/icon2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/icon3.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/icon3.png
--- a/view/yinmeng/activity/2024-childrenDay/images/icon4.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/icon4.png
--- a/view/yinmeng/activity/2024-childrenDay/images/icon5.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/icon5.png
--- a/view/yinmeng/activity/2024-childrenDay/images/icon6.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/icon6.png
--- a/view/yinmeng/activity/2024-childrenDay/images/liBg.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/liBg.png
--- a/view/yinmeng/activity/2024-childrenDay/images/lisTabAct.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/lisTabAct.png
--- a/view/yinmeng/activity/2024-childrenDay/images/listBox.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/listBox.png
--- a/view/yinmeng/activity/2024-childrenDay/images/listNo.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/listNo.png
--- a/view/yinmeng/activity/2024-childrenDay/images/listTab.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/listTab.png
--- a/view/yinmeng/activity/2024-childrenDay/images/listText1.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/listText1.png
--- a/view/yinmeng/activity/2024-childrenDay/images/listText2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/listText2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/listText3.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/listText3.png
--- a/view/yinmeng/activity/2024-childrenDay/images/list_icon.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/list_icon.png
--- a/view/yinmeng/activity/2024-childrenDay/images/logo.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/logo.png
--- a/view/yinmeng/activity/2024-childrenDay/images/no1.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/no1.png
--- a/view/yinmeng/activity/2024-childrenDay/images/no2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/no2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/no3.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/no3.png
--- a/view/yinmeng/activity/2024-childrenDay/images/playAgain.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/playAgain.png
--- a/view/yinmeng/activity/2024-childrenDay/images/records.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/records.png
--- a/view/yinmeng/activity/2024-childrenDay/images/resultBg.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/resultBg.png
--- a/view/yinmeng/activity/2024-childrenDay/images/resultBg2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/resultBg2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/resultOut.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/resultOut.png
--- a/view/yinmeng/activity/2024-childrenDay/images/resultText1.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/resultText1.png
--- a/view/yinmeng/activity/2024-childrenDay/images/resultText2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/resultText2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/rule1.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/rule1.png
--- a/view/yinmeng/activity/2024-childrenDay/images/rule2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/rule2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/rule_bg.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/rule_bg.png
--- a/view/yinmeng/activity/2024-childrenDay/images/rule_icon.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/rule_icon.png
--- a/view/yinmeng/activity/2024-childrenDay/images/text_icon.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/text_icon.png
--- a/view/yinmeng/activity/2024-childrenDay/images/toastBut.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/toastBut.png
--- a/view/yinmeng/activity/2024-childrenDay/images/toastButAct.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/toastButAct.png
--- a/view/yinmeng/activity/2024-childrenDay/images/toastPubBg.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/toastPubBg.png
--- a/view/yinmeng/activity/2024-childrenDay/images/toast_icon.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/toast_icon.png
--- a/view/yinmeng/activity/2024-childrenDay/images/travel/back.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/travel/back.png
--- a/view/yinmeng/activity/2024-childrenDay/images/view.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/view.png
--- a/view/yinmeng/activity/2024-childrenDay/images/view2.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/view2.png
--- a/view/yinmeng/activity/2024-childrenDay/images/view3.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/view3.png
--- a/view/yinmeng/activity/2024-childrenDay/images/woastButAct.png
+++ b/view/yinmeng/activity/2024-childrenDay/images/woastButAct.png
--- a/view/yinmeng/activity/2024-childrenDay/index.html
+++ b/view/yinmeng/activity/2024-childrenDay/index.html
@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>重返童年</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/swiper-bundle.min.css">
+    <link rel="stylesheet" href="./css/index.css">
+</head>
+
+<body>
+    <!-- 顶部返回 -->
+    <div class="back">
+        <img src="./images/travel/back.png" alt="">
+    </div>
+    <!-- header -->
+    <div class="header">
+        <img src="./images/rule_icon.png" alt="" class="rule_icon">
+    </div>
+    <!-- 限定礼物 -->
+    <div class="giftBox">
+        <div class="swiper">
+            <div class="swiper-wrapper">
+                <div class="swiper-slide">
+                    <img src="./images/gift1.png" alt="">
+                </div>
+                <div class="swiper-slide">
+                    <img src="./images/gift2.png" alt="">
+                </div>
+                <div class="swiper-slide">
+                    <img src="./images/gift3.png" alt="">
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 游戏地图 -->
+    <div class="game">
+        <!-- 放大镜数量 -->
+        <div class="magnifyingGlass">放大镜数量:<b>0</b></div>
+        <!-- 游戏记录 -->
+        <div class="records">游园记录</div>
+        <!-- 榜单 -->
+        <img src="./images/list_icon.png" alt="" class="list_icon">
+        <!-- 任务 -->
+        <img src="./images/toast_icon.png" alt="" class="toast_icon">
+        <!-- 游园按钮 -->
+        <img src="./images/but_icon.png" alt="" class="but">
+        <!-- icon -->
+        <img src="./images/icon1.png" alt="" class="icon icon1">
+        <img src="./images/icon2.png" alt="" class="icon icon2">
+        <img src="./images/icon3.png" alt="" class="icon icon3">
+        <img src="./images/icon4.png" alt="" class="icon icon4">
+        <img src="./images/icon5.png" alt="" class="icon icon5">
+        <img src="./images/icon6.png" alt="" class="icon icon6">
+        <!-- 点击图标站位按钮 -->
+        <div class="buts buts1"></div>
+        <div class="buts buts2"></div>
+        <div class="buts buts3"></div>
+        <div class="buts buts4"></div>
+        <div class="buts buts5"></div>
+        <div class="buts buts6"></div>
+        <!-- 赢结果页 -->
+        <div class="result">
+            <img src="./images/logo.png" alt="" class="tx_left">
+            <img src="./images/logo.png" alt="" class="tx_right">
+            <div class="name_left">虚位以待</div>
+            <div class="name_right">虚位以待</div>
+            <div class="id_right">ID:0</div>
+            <img src="./images/resultText1.png" alt="" class="resultText">
+            <div class="text1">请收下你的战利品</div>
+            <div class="giftName">礼物昵称</div>
+            <div class="giftBoxs">
+                <img src="./images/logo.png" alt="" class="giftImg">
+            </div>
+            <img src="./images/view.png" alt="" class="view">
+            <img src="./images/playAgain.png" alt="" class="playAgain">
+        </div>
+        <!-- 输结果页 -->
+        <div class="result2">
+            <img src="./images/logo.png" alt="" class="tx_left">
+            <div class="name_left">虚位以待</div>
+            <img src="./images/resultText2.png" alt="" class="resultText">
+            <div class="text1">请收下你的战利品</div>
+            <div class="giftName">礼物昵称</div>
+            <div class="giftBoxs">
+                <img src="./images/logo.png" alt="" class="giftImg">
+            </div>
+            <img src="./images/view3.png" alt="" class="view">
+            <img src="./images/playAgain.png" alt="" class="playAgain">
+        </div>
+    </div>
+    <!-- 榜单弹窗 -->
+    <div class="list_pub">
+        <div class="list_pub_in">
+            <div class="tab">
+                <div class="act">搜捕榜</div>
+                <div>童趣榜</div>
+                <div>童年榜</div>
+            </div>
+            <!-- 前叁 -->
+            <div class="top1">
+                <img src="./images/no1.png" alt="" class="ts">
+                <img src="./images/logo.png" alt="" class="tx">
+                <div class="name">虚位以待</div>
+                <div class="score">童趣值:0</div>
+            </div>
+            <div class="top2">
+                <img src="./images/no2.png" alt="" class="ts">
+                <img src="./images/logo.png" alt="" class="tx">
+                <div class="name">虚位以待</div>
+                <div class="score">童趣值:0</div>
+            </div>
+            <div class="top3">
+                <img src="./images/no3.png" alt="" class="ts">
+                <img src="./images/logo.png" alt="" class="tx">
+                <div class="name">虚位以待</div>
+                <div class="score">童趣值:0</div>
+            </div>
+            <!-- 非前叁 -->
+            <ul>
+                <li>
+                    <div class="num">4</div>
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <div class="name">虚位以待</div>
+                    <div class="score">童趣值:0</div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <!-- 任务弹窗 -->
+    <div class="toast_pub">
+        <div class="toast_pub_in">
+            <img src="./images/close.png" alt="" class="close">
+            <div class="toasts toasts1">
+                <p>登录活动页</p>
+                <span>奖励:放大镜*1</span>
+                <div class="but">未完成</div>
+            </div>
+            <div class="toasts toasts2">
+                <p>关注一位新的好友(0/3)</p>
+                <span>奖励:放大镜*1</span>
+                <div class="but">未完成</div>
+            </div>
+            <div class="toasts toasts3">
+                <p>房间停留10mins~(0/3)</p>
+                <span>奖励:放大镜*1</span>
+                <div class="but">未完成</div>
+            </div>
+            <div class="toasts toasts4">
+                <p>送出or收到300金币的61限定礼物</p>
+                <span>奖励:放大镜*1</span>
+                <i>今日已获得:0</i>
+                <div class="but">未完成</div>
+            </div>
+            <div class="toasts toasts5">
+                <p>送出or收到800金币礼物</p>
+                <span>奖励:放大镜*1</span>
+                <i>今日已获得:0</i>
+                <div class="but">未完成</div>
+            </div>
+        </div>
+    </div>
+    <!-- 游戏记录弹窗 -->
+    <div class="records_pub">
+        <div class="records_pub_in">
+            <div class="title">
+                <div>获奖时间</div>
+                <div>奖品</div>
+            </div>
+            <ul>
+                <li>
+                    <div>
+                        <p>2024/01/22</p>
+                        <b>23:59:59</b>
+                    </div>
+                    <div>
+                        <p>礼物名称</p>
+                        <i>XX天</i>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <!-- 规则 -->
+    <div class="rule">
+        <div class="rule_in">
+            <div class="tab">
+                <div class="act">活动规则</div>
+                <div>活动奖励</div>
+            </div>
+            <div class="imgBox">
+                <img src="./images/rule1.png" alt="" class="img1">
+                <img src="./images/rule2.png" alt="" class="img2">
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="./js/swiper-bundle.min.js"></script>
+<script src="./js/index.js"></script>
--- a/view/yinmeng/activity/2024-childrenDay/js/index.js
+++ b/view/yinmeng/activity/2024-childrenDay/js/index.js
@@ -0,0 +1,474 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+if (env == 'test') {
+    new VConsole();
+}
+var langReplace;
+var localLang;
+// 封装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'
+    })
+}
+var page = 1;
+var isLock = true;
+var magnifyingGlass = 0;
+var listType = 1;
+var gameType = true;
+// 初始化函数
+$(function () {
+    getInfoFromClient();
+    setTimeout(function () {
+        // 页面全屏
+        if (browser.app) {
+            if (browser.android) {
+                window.androidJsObj.initShowNav(false)
+            } else {
+                window.webkit.messageHandlers.initShowNav.postMessage(0)
+            }
+        };
+        // 顶部返回事件
+        $('.back').click(() => {
+            if (browser.android) {
+                window.androidJsObj.closeWebView()
+            } else {
+                window.webkit.messageHandlers.closeWebView.postMessage(null)
+            }
+        })
+        swiperFun();
+        getInfo();
+    }, 100)
+})
+// 礼物轮播
+function swiperFun() {
+    var mySwiper = new Swiper('.swiper', {
+        direction: "vertical",
+        loop: true,
+        autoplay: {
+            delay: 3000,//
+            disableOnInteraction: false
+        }
+    })
+}
+// 活动信息接口
+function getInfo() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/activity/info',
+        data: { activityCode: 'ACT_2024_CHILDREN_DAY' },
+        success(res) {
+            if (res.code === 200) {
+                showLoading()
+                networkRequest({
+                    type: 'get',
+                    url: urlPrefix + '/activity/currency',
+                    data: { redisKey: 'act_user_task_extra_data' },
+                    success(res) {
+                        if (res.code === 200) {
+                            magnifyingGlass = res.data
+                            $('.game .magnifyingGlass b').text(magnifyingGlass);
+                        } else {
+                            toastMsg(res.message)
+                        }
+                        hideLoading(layerIndex)
+                    },
+                    error(err) {
+                        hideLoading(layerIndex)
+                        toastMsg('网络错误')
+                    }
+                })
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+        }
+    })
+}
+// 打开榜单
+$('.game .list_icon').click(function () {
+    listFun(listType)
+    $('.list_pub').show();
+    bodyScroolFun(true);
+})
+// 榜单切换
+$('.list_pub .list_pub_in .tab div').click(function () {
+    var i = $(this).index() + 1;
+    listType = i;
+    $(this).addClass('act').siblings().removeClass('act');
+    listFun(listType)
+    return false;
+})
+// 活动信息接口
+function listFun(type) {
+    var str = '';
+    $('.list_pub .list_pub_in ul li').remove();
+    showLoading()
+    if (type == 1) {
+        networkRequest({
+            type: 'get',
+            url: urlPrefix + '/allrank/geth5',
+            data: {
+                uid: pubInfo.uid,
+                type: 5,
+                datetype: 3,
+                pageNum: 1,
+                pageSize: 999999999,
+            },
+            success(res) {
+                if (res.code === 200) {
+                    var listTo3 = res.data.rankVoList.slice(0, 3);
+                    var notListTo3 = res.data.rankVoList.slice(3);
+                    if (listTo3.length < 3) {
+                        let arr = new Array(3 - listTo3.length).fill({
+                            avatar: './images/logo.png',
+                            nick: '虚位以待',
+                            totalNum: "0"
+                        })
+                        listTo3.push(...arr)
+                    }
+                    // 处理前叁
+                    listTo3.forEach((res, i) => {
+                        if (res.score > 10000) {
+                            res.score = ((Math.floor(res.totalNum / 1000)) / 10).toFixed(1) + 'W'
+                        }
+                        $(`.list_pub .list_pub_in .top${i + 1} .tx`).attr("src", res.avatar);
+                        $(`.list_pub .list_pub_in .top${i + 1} .name`).text(res.nick);
+                        $(`.list_pub .list_pub_in .top${i + 1} .score`).text('搜捕值:' + res.totalNum);
+                    });
+                    notListTo3.forEach((res, i) => {
+                        if (res.score > 10000) {
+                            res.score = ((Math.floor(res.score / 1000)) / 10).toFixed(1) + 'W'
+                        }
+                        str += `
+                            <li>
+                                <div class="num">${i + 4 > 30 ? '30+' : i + 4}</div>
+                                <img src="${res.avatar}" alt="" class="tx">
+                                <div class="name">${res.nick}</div>
+                                <div class="score">搜捕值:${res.totalNum}</div>
+                            </li>
+                        `
+                    })
+                    $('.list_pub .list_pub_in ul').append(str);
+                } else {
+                    toastMsg(res.message)
+                }
+                hideLoading(layerIndex)
+            },
+            error(err) {
+                hideLoading(layerIndex)
+                toastMsg('网络错误')
+            }
+        })
+
+    } else {
+        networkRequest({
+            type: 'get',
+            url: urlPrefix + '/act/special/gift/getRank',
+            data: {
+                pageSize: 999999999,
+                rankType: type == 2 ? 4 : 2,
+            },
+            success(res) {
+                if (res.code === 200) {
+                    var listTo3 = res.data.rankList.slice(0, 3);
+                    var notListTo3 = res.data.rankList.slice(3);
+                    if (listTo3.length < 3) {
+                        let arr = new Array(3 - listTo3.length).fill({
+                            avatar: './images/logo.png',
+                            nick: '虚位以待',
+                            score: "0"
+                        })
+                        listTo3.push(...arr)
+                    }
+                    // 处理前叁
+                    listTo3.forEach((res, i) => {
+                        if (res.score > 10000) {
+                            res.score = ((Math.floor(res.score / 1000)) / 10).toFixed(1) + 'W'
+                        }
+                        $(`.list_pub .list_pub_in .top${i + 1} .tx`).attr("src", res.avatar);
+                        $(`.list_pub .list_pub_in .top${i + 1} .name`).text(res.nick);
+                        $(`.list_pub .list_pub_in .top${i + 1} .score`).text( `${type == 2 ? '童趣值:' : "童年值:"}`+res.score);
+                    });
+                    notListTo3.forEach((res,i) => {
+                        if (res.score > 10000) {
+                            res.score = ((Math.floor(res.score / 1000)) / 10).toFixed(1) + 'W'
+                        }
+                        str += `
+                            <li>
+                                <div class="num">${i + 4 > 30 ? '30+' : i + 4}</div>
+                                <img src="${res.avatar}" alt="" class="tx">
+                                <div class="name">${res.nick}</div>
+                                <div class="score">${type == 2 ? '童趣值:' : "童年值:" }${res.score}</div>
+                            </li>
+                        `
+                    })
+                    $('.list_pub .list_pub_in ul').append(str);
+                } else {
+                    toastMsg(res.message)
+                }
+                hideLoading(layerIndex)
+            },
+            error(err) {
+                hideLoading(layerIndex)
+                toastMsg('网络错误')
+            }
+        })
+    }
+}
+// 关闭榜单
+$('.list_pub').click(function () {
+    $('.list_pub').hide();
+    bodyScroolFun(false);
+})
+// 打开任务
+$('.game .toast_icon').click(function () {
+    getTask();
+})
+// 活动信息接口
+function getTask() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/act/children/task',
+        success(res) {
+            if (res.code === 200) {
+                res.data.isLoginTask ? $('.toast_pub .toast_pub_in .toasts1 .but').addClass('act') : $('.toast_pub .toast_pub_in .toasts1 .but').removeClass('act');
+                res.data.isLoginTask ? $('.toast_pub .toast_pub_in .toasts1 .but').text('已完成') : $('.toast_pub .toast_pub_in .toasts1 .but').text('未完成');
+                $('.toast_pub .toast_pub_in .toasts2 p').text(`关注一位新的好友(${res.data.userFollowCount}/3)`);
+                res.data.isUserFollowTask ? $('.toast_pub .toast_pub_in .toasts2 .but').addClass('act') : $('.toast_pub .toast_pub_in .toasts2 .but').removeClass('act');
+                res.data.isUserFollowTask ? $('.toast_pub .toast_pub_in .toasts2 .but').text('已完成') : $('.toast_pub .toast_pub_in .toasts2 .but').text('未完成');
+                $('.toast_pub .toast_pub_in .toasts3 p').text(`房间停留10mins~(${res.data.keepTimeCount}/3)`);
+                res.data.isKeepTimeTask ? $('.toast_pub .toast_pub_in .toasts3 .but').addClass('act') : $('.toast_pub .toast_pub_in .toasts3 .but').removeClass('act');
+                res.data.isKeepTimeTask ? $('.toast_pub .toast_pub_in .toasts3 .but').text('已完成') : $('.toast_pub .toast_pub_in .toasts3 .but').text('未完成');
+                $('.toast_pub .toast_pub_in .toasts4 i').text(`今日已获得:${res.data.limitGiftCount}`);
+                res.data.isLimitGiftFor61Task ? $('.toast_pub .toast_pub_in .toasts4 .but').addClass('act') : $('.toast_pub .toast_pub_in .toasts4 .but').removeClass('act');
+                res.data.isLimitGiftFor61Task ? $('.toast_pub .toast_pub_in .toasts4 .but').text('已完成') : $('.toast_pub .toast_pub_in .toasts4 .but').text('未完成');
+                $('.toast_pub .toast_pub_in .toasts5 i').text(`今日已获得:${res.data.joinGreedyFor1000Count}`);
+                res.data.isJoinGreedyFor1000Task ? $('.toast_pub .toast_pub_in .toasts5 .but').addClass('act') : $('.toast_pub .toast_pub_in .toasts5 .but').removeClass('act');
+                res.data.isJoinGreedyFor1000Task ? $('.toast_pub .toast_pub_in .toasts5 .but').text('已完成') : $('.toast_pub .toast_pub_in .toasts5 .but').text('未完成');
+                $('.toast_pub').show();
+                bodyScroolFun(true);
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+        }
+    })
+}
+// 关闭任务
+$('.toast_pub .toast_pub_in .close').click(function () {
+    $('.toast_pub').hide();
+    bodyScroolFun(false);
+})
+// 关闭结果弹窗
+$('.game .result .view').click(function () {
+    $('.result,.result2').hide();
+    var roomUid = $(this).attr('uid');
+    if (gameType) {
+        // 跳转房间
+        if (browser.ios) {
+            window.webkit.messageHandlers.openRoom.postMessage(roomUid);
+        } else if (browser.android) {
+            if (androidJsObj && typeof androidJsObj === 'object') {
+                window.androidJsObj.openRoom(roomUid);
+            }
+        }
+    }
+    // 打开主页
+    if (browser.ios) {
+        window.webkit.messageHandlers.openPersonPage.postMessage(roomUid);
+        setTimeout(function () { lock = true; }, 200)
+    } else if (browser.android) {
+        if (androidJsObj && typeof androidJsObj === 'object') {
+            window.androidJsObj.openPersonPage(roomUid);
+        }
+    }
+})
+$('.game .result2 .view').click(function () {
+    $('.result,.result2').hide();
+})
+$('.game .result,.game .result2').click(function () {
+    $('.result,.result2').hide();
+})
+// 关闭记录弹窗
+$('.records_pub').click(function () {
+    $('.records_pub').hide();
+    bodyScroolFun(false);
+})
+// 切换规则按钮
+$('.rule .rule_in .tab div').click(function () {
+    var i = $(this).index() + 1;
+    $(this).addClass('act').siblings().removeClass('act')
+    $('.rule .rule_in .imgBox img').hide();
+    $(`.rule .rule_in .imgBox .img${i}`).show();
+    return false;
+})
+// 打开规则
+$('.header .rule_icon').click(function () {
+    $('.rule').show();
+    bodyScroolFun(true);
+})
+// 关闭规则
+$('.rule').click(function () {
+    $('.rule').hide();
+    bodyScroolFun(false);
+})
+// 记录接口
+function record(page) {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/activity/task/user/record/page',
+        data: { activityCode: 'ACT_2024_CHILDREN_DAY', componentCode: 'TONG_QU_LE_YUAN', pageNum: page, pageSize: 10 },
+        success(res) {
+            if (res.code === 200) {
+                var str = '';
+                if (res.data.records.length == 0 && page == 1) {
+                    str += `<li class="null"><div>暂无</div><div>暂无</div></li>`
+                    isLock = false;
+                } else {
+                    res.data.records.forEach(res => {
+                        str += `
+                        <li>
+                            <div>
+                                <p>${dateFormat(res.createTime, 'yyyy/MM/dd')}</p>
+                                <b>${dateFormat(res.createTime, 'hh/mm/ss')}</b>
+                            </div>
+                            <div>
+                                <p>${res.rewardName}</p>
+                                <i>${res.rewardNum}${rewardTypeFun(res.rewardType).unit}</i>
+                            </div>
+                        </li>`
+                    })
+                    if (res.data.records.length == 0) {
+                        isLock = false;
+                    } else {
+                        isLock = true;
+                    }
+                }
+                $('.records_pub .records_pub_in ul').append(str);
+                $('.records_pub').show();
+                bodyScroolFun(true);
+            } else {
+                isLock = true;
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            isLock = true;
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+        }
+    })
+}
+// 兑换记录滚动
+$('.records_pub .records_pub_in ul').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.records_pub .records_pub_in ul')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        if (isLock) {
+            // 请求下一页
+            page = page + 1;
+            record(page)
+            isLock = false;
+        }
+    }
+})
+// 打开记录
+$('.game .records').click(function () {
+    $('.records_pub .records_pub_in ul li').remove();
+    page = 1;
+    record(page);
+})
+// 关闭记录
+$('.records_pub').click(function () {
+    $('.records_pub').hide();
+    bodyScroolFun(false);
+})
+// 逮捕按钮
+$('.game .buts,.game .but,.game .result .playAgain,.game .result2 .playAgain').click(function () {
+    $('.game .result2,.game .result1').hide();
+    draw();
+})
+// 活动信息接口
+function draw() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/act/children/draw',
+        success(res) {
+            if (res.code === 200) {
+                if (res.data.isWin) {
+                    // 中奖
+                    $('.game .result .tx_left').attr('src', res.data.avatar);
+                    $('.game .result .tx_right').attr('src', res.data.anchorAvatar);
+                    $('.game .result .tx_right').attr('uid', res.data.anchorRoomUid);
+                    $('.game .result .view').attr('uid', res.data.anchorRoomUid);
+                    gameType = res.data.isOnline;
+                    gameType ? $('.game .result .view').attr('src', './images/view2.png') : $('.game .result .view').attr('src', './images/view.png');
+                    $('.game .result .name_left').text('我');
+                    $('.game .result .name_Right').text(res.data.anchorNick);
+                    $('.game .result .id_right').text("ID:" + res.data.anchorErBanNo);
+                    $('.game .result .giftBoxs img').attr("src", res.data.rewardIcon);
+                    $('.game .result .giftName').text(res.data.rewardName);
+                    $('.game .result').show();
+                } else {
+                    // 非中奖
+                    $('.game .result2 .tx_left').attr('src', res.data.avatar);
+                    $('.game .result2 .name_left').text('我');
+                    $('.game .result2 .giftBoxs img').attr("src", res.data.rewardIcon);
+                    $('.game .result2 .giftName').text(res.data.rewardName);
+                    $('.game .result2').show();
+                }
+                getInfo();
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+        }
+    })
+}
+// 跳转主播房间
+$('.game .result .tx_right').click(function () {
+    var roomUid = $(this).attr('uid');
+    if (browser.ios) {
+        window.webkit.messageHandlers.openRoom.postMessage(roomUid);
+    } else if (browser.android) {
+        if (androidJsObj && typeof androidJsObj === 'object') {
+            window.androidJsObj.openRoom(roomUid);
+        }
+    }
+})
--- a/view/yinmeng/activity/2024-childrenDay/js/swiper-bundle.min.js
+++ b/view/yinmeng/activity/2024-childrenDay/js/swiper-bundle.min.js
--- a/view/yinmeng/activity/2024-cityLove/css/index.css
+++ b/view/yinmeng/activity/2024-cityLove/css/index.css
@@ -0,0 +1,731 @@
+html,
+body {
+  width: 100%;
+  background: #F9E4D6;
+}
+
+.rabbit {
+  z-index: 999;
+  width: 0.8rem;
+  height: 0.8rem;
+}
+
+.back {
+  position: fixed;
+  top: 0.93333rem;
+  left: 0.45333rem;
+  z-index: 99;
+  width: 0.82667rem;
+  height: 0.82667rem;
+}
+
+.back img {
+  width: 100%;
+  height: 100%;
+}
+
+.back p {
+  color: #fff;
+  font-size: 0.42667rem;
+  position: absolute;
+  width: 9rem;
+  left: 0;
+  top: 0;
+  height: 100%;
+  text-align: center;
+  line-height: 0.82667rem;
+}
+
+.header {
+  width: 10rem;
+  height: 11.6rem;
+  background: url(../images/header.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  margin: 0 auto 0rem;
+}
+
+.header .rule_icon {
+  position: absolute;
+  width: 1.76rem;
+  height: 0.97333rem;
+  right: 0;
+  top: 4.6rem;
+}
+
+.header .tab {
+  width: 7.89333rem;
+  height: 1.36rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 7.64rem;
+  display: flex;
+  justify-content: space-between;
+}
+
+.header .tab div {
+  width: 3.46667rem;
+  height: 100%;
+}
+
+.header .tab .tab1 {
+  background: url(../images/tab1.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.header .tab .tab2 {
+  background: url(../images/tab2.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.header .tab .act1 {
+  background: url(../images/tabAct1.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.header .tab .act2 {
+  background: url(../images/tabAct2.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.page1 .page1Box1 {
+  width: 10rem;
+  height: 9.74667rem;
+  display: block;
+  margin: -2.6rem auto 0rem;
+  position: relative;
+}
+
+.page1 .page1Box2 {
+  width: 10rem;
+  height: 12.44rem;
+  display: block;
+  margin: -1.1rem auto 0rem;
+  position: relative;
+}
+
+.page1 .page1Box3 {
+  width: 10rem;
+  height: 12.28rem;
+  display: block;
+  margin: -1.1rem auto 0rem;
+  position: relative;
+}
+
+.page1 .page1Box4 {
+  width: 10rem;
+  height: 15rem;
+  margin: -1.1rem auto 0rem;
+  position: relative;
+  background: url(../images/page1Box4.png) no-repeat 100% 100%;
+  background-size: 100% 100%;
+}
+
+.page1 .page1Box4 .left {
+  width: 3.48rem;
+  height: 0.84rem;
+  line-height: 0.81333rem;
+  background: url(../images/page1Box4_left.png) no-repeat;
+  background-size: 100% 100%;
+  color: #FF5B8D;
+  font-size: 0.28rem;
+  position: absolute;
+  left: 0;
+  top: 2.69333rem;
+  text-indent: 2.55rem;
+  font-weight: bold;
+}
+
+.page1 .page1Box4 .right {
+  width: 3.48rem;
+  height: 0.84rem;
+  position: absolute;
+  right: 0;
+  top: 2.69333rem;
+}
+
+.page1 .page1Box4 .dayLimit {
+  width: 0.76rem;
+  height: 0.36rem;
+  line-height: 0.36rem;
+  text-align: center;
+  color: #fff;
+  font-size: 0.16rem;
+  font-weight: 500;
+  position: absolute;
+  top: 4.10667rem;
+  background: url(../images/dayLimit.png) no-repeat;
+  background-size: 100% 100%;
+  text-indent: 0.05rem;
+  white-space: nowrap;
+}
+
+.page1 .page1Box4 .dayLimit1 {
+  left: 2.81333rem;
+}
+
+.page1 .page1Box4 .dayLimit2 {
+  left: 5.49333rem;
+}
+
+.page1 .page1Box4 .dayLimit3 {
+  left: 8.22667rem;
+}
+
+.page1 .page1Box4 .convert {
+  width: 1.73333rem;
+  height: 0.61333rem;
+  position: absolute;
+}
+
+.page1 .page1Box4 .convert1 {
+  left: 1.37333rem;
+  top: 6.33333rem;
+}
+
+.page1 .page1Box4 .convert2 {
+  left: 4.04rem;
+  top: 6.33333rem;
+}
+
+.page1 .page1Box4 .convert3 {
+  left: 6.8rem;
+  top: 6.33333rem;
+}
+
+.page1 .page1Box4 .convert4 {
+  left: 1.37333rem;
+  top: 9.45333rem;
+}
+
+.page1 .page1Box4 .convert5 {
+  left: 4.04rem;
+  top: 9.45333rem;
+}
+
+.page1 .page1Box4 .convert6 {
+  left: 6.8rem;
+  top: 9.45333rem;
+}
+
+.page1 .page1Box4 .convert7 {
+  left: 2.8rem;
+  top: 12.65333rem;
+}
+
+.page1 .page1Box4 .convert8 {
+  left: 5.45333rem;
+  top: 12.65333rem;
+}
+
+.page2 {
+  display: none;
+  width: 10rem;
+  height: 20.56rem;
+  background: url(../images/page2.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  margin: -2.6rem auto 1.33333rem;
+}
+
+.page2 .first .left_ts {
+  width: 2.16rem;
+  height: 2.13333rem;
+  position: absolute;
+  left: 2.16rem;
+  top: 2.68rem;
+  z-index: 2;
+}
+
+.page2 .first .right_ts {
+  width: 2.16rem;
+  height: 2.13333rem;
+  position: absolute;
+  right: 2.16rem;
+  top: 2.68rem;
+  z-index: 2;
+}
+
+.page2 .first .left_tx {
+  width: 1.76rem;
+  height: 1.76rem;
+  border-radius: 50%;
+  position: absolute;
+  left: 2.33333rem;
+  top: 2.89333rem;
+}
+
+.page2 .first .right_tx {
+  width: 1.76rem;
+  height: 1.76rem;
+  border-radius: 50%;
+  position: absolute;
+  right: 2.33333rem;
+  top: 2.89333rem;
+}
+
+.page2 .first .score {
+  width: 1.5rem;
+  text-align: center;
+  -webkit-text-stroke: 0.01333rem #FE5A9F;
+  /* Safari */
+  font-size: 0.28rem;
+  color: #fff;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 3.82667rem;
+  font-weight: bold;
+}
+
+.page2 .first .leftNick {
+  width: 2.16rem;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  position: absolute;
+  left: 2.24rem;
+  top: 5rem;
+  color: #B8004E;
+  font-weight: bold;
+  font-size: 0.28rem;
+}
+
+.page2 .first .rightNick {
+  width: 2.16rem;
+  text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  position: absolute;
+  right: 2.24rem;
+  top: 5rem;
+  color: #B8004E;
+  font-weight: bold;
+  font-size: 0.28rem;
+}
+
+.page2 .notFirst {
+  width: 8.88rem;
+  height: 12rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 7.13333rem;
+  overflow-y: scroll;
+}
+
+.page2 .notFirst::-webkit-scrollbar {
+  display: none;
+}
+
+.page2 .notFirst li {
+  width: 8.88rem;
+  height: 1.82667rem;
+  background: url(../images/listBg.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  overflow: hidden;
+}
+
+.page2 .notFirst li .num {
+  width: 0.66667rem;
+  height: 100%;
+  line-height: 1.82667rem;
+  text-align: center;
+  color: #B16B74;
+  font-size: 0.30667rem;
+  font-weight: 500;
+  float: left;
+  margin-left: 0.52rem;
+  margin-right: 0.2rem;
+}
+
+.page2 .notFirst li .left_tx {
+  width: 1.09333rem;
+  height: 1.09333rem;
+  border-radius: 1.09333rem;
+  float: left;
+  margin-top: 0.38667rem;
+  border: 0.02667rem solid #FFABC7;
+  margin-right: 0.18667rem;
+}
+
+.page2 .notFirst li .right_tx {
+  width: 1.09333rem;
+  height: 1.09333rem;
+  border-radius: 1.09333rem;
+  float: left;
+  margin-top: 0.38667rem;
+  border: 0.02667rem solid #FFABC7;
+}
+
+.page2 .notFirst li .love {
+  width: 1.02667rem;
+  height: 0.90667rem;
+  position: absolute;
+  left: 2.10667rem;
+  top: 0.50667rem;
+}
+
+.page2 .notFirst li .nickLeft {
+  width: 2.2rem;
+  color: #FF658E;
+  font-size: 0.28rem;
+  font-weight: 500;
+  position: absolute;
+  left: 4rem;
+  top: 0.58667rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.page2 .notFirst li .nickRight {
+  width: 2.2rem;
+  color: #FF658E;
+  font-size: 0.28rem;
+  font-weight: 500;
+  position: absolute;
+  left: 4rem;
+  top: 0.98667rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.page2 .notFirst li .score {
+  float: right;
+  height: 100%;
+  line-height: 1.82667rem;
+  color: #FE5F93;
+  font-size: 0.32rem;
+  margin-right: 1rem;
+  font-weight: 500;
+}
+
+.page2 .my {
+  width: 10rem;
+  height: 3.16rem;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  background: url(../images/my.png) no-repeat;
+  background-size: 100% 100%;
+  background: url(../images/my2.png) no-repeat;
+  background-size: 100% 100%;
+  transition: all .3s;
+  z-index: 3;
+}
+
+.page2 .my .more {
+  width: 1.24rem;
+  height: 1.24rem;
+  position: absolute;
+  right: 0.09333rem;
+  top: -0.41333rem;
+}
+
+.page2 .my ul {
+  width: 8.88rem;
+  height: 1.82667rem;
+  margin: 1.10667rem auto 0;
+  overflow-y: hidden;
+}
+
+.page2 .my ul::-webkit-scrollbar {
+  display: none;
+}
+
+.page2 .my ul li {
+  width: 100%;
+  height: 1.82667rem;
+  background: url(../images/myList.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  margin-bottom: 0.10667rem;
+  overflow: hidden;
+}
+
+.page2 .my ul li .num {
+  width: 0.66667rem;
+  height: 100%;
+  line-height: 1.82667rem;
+  text-align: center;
+  color: #B16B74;
+  font-size: 0.30667rem;
+  font-weight: 500;
+  float: left;
+  margin-left: 0.52rem;
+  margin-right: 0.2rem;
+}
+
+.page2 .my ul li .left_tx {
+  width: 1.09333rem;
+  height: 1.09333rem;
+  border-radius: 1.09333rem;
+  float: left;
+  margin-top: 0.38667rem;
+  border: 0.02667rem solid #FFABC7;
+  margin-right: 0.18667rem;
+}
+
+.page2 .my ul li .right_tx {
+  width: 1.09333rem;
+  height: 1.09333rem;
+  border-radius: 1.09333rem;
+  float: left;
+  margin-top: 0.38667rem;
+  border: 0.02667rem solid #FFABC7;
+}
+
+.page2 .my ul li .love {
+  width: 1.02667rem;
+  height: 0.90667rem;
+  position: absolute;
+  left: 2.10667rem;
+  top: 0.50667rem;
+}
+
+.page2 .my ul li .nickLeft {
+  width: 2.2rem;
+  color: #FF658E;
+  font-size: 0.28rem;
+  font-weight: 500;
+  position: absolute;
+  left: 4rem;
+  top: 0.58667rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.page2 .my ul li .nickRight {
+  width: 2.2rem;
+  color: #FF658E;
+  font-size: 0.28rem;
+  font-weight: 500;
+  position: absolute;
+  left: 4rem;
+  top: 0.98667rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.page2 .my ul li .score {
+  float: right;
+  height: 100%;
+  line-height: 1.82667rem;
+  color: #FE5F93;
+  font-size: 0.32rem;
+  margin-right: 1rem;
+  font-weight: 500;
+}
+
+.page2 .my ul .null {
+  background: none;
+  text-align: center;
+  line-height: 1.82667rem;
+  color: #FF658E;
+  font-size: 0.4rem;
+  font-weight: 500;
+}
+
+.rule {
+  position: fixed;
+  z-index: 99;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+}
+
+.rule .rule_in {
+  width: 9.10667rem;
+  height: 13.18667rem;
+  background: url(../images/ruleBg.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  overflow: hidden;
+}
+
+.rule .rule_in .tab {
+  width: 6.64rem;
+  height: 1.22667rem;
+  display: flex;
+  justify-content: space-between;
+  margin: 2.4rem auto 0.25333rem;
+}
+
+.rule .rule_in .tab div {
+  width: 3.13333rem;
+  height: 1.22667rem;
+}
+
+.rule .rule_in .tab .tab1 {
+  background: url(../images/ruleTab1.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.rule .rule_in .tab .tab2 {
+  background: url(../images/ruleTab2.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.rule .rule_in .tab .act1 {
+  background: url(../images/ruleTabAct1.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.rule .rule_in .tab .act2 {
+  background: url(../images/ruleTabAct2.png) no-repeat;
+  background-size: 100% 100%;
+}
+
+.rule .rule_in .box {
+  width: 7.81333rem;
+  height: 8.5rem;
+  margin: 0 auto 0;
+  overflow-y: scroll;
+}
+
+.rule .rule_in .box::-webkit-scrollbar {
+  display: none;
+}
+
+.rule .rule_in .box img {
+  display: block;
+  width: 100%;
+}
+
+.rule .rule_in .box .img2 {
+  display: none;
+}
+
+.rule .rule_in .box2 {
+  width: 8.29333rem;
+}
+
+.end {
+  position: fixed;
+  z-index: 99;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+}
+
+.end .end_in {
+  width: 7rem;
+  height: 5.48rem;
+  background: url(../images/endBg.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  overflow: hidden;
+}
+
+.end .but {
+  width: 3.14667rem;
+  height: 1.22667rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0.81333rem;
+}
+
+.records {
+  position: fixed;
+  z-index: 99;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+}
+
+.records .records_in {
+  width: 9.61333rem;
+  height: 8.48rem;
+  background: url(../images/recordsBg.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  overflow: hidden;
+}
+
+.records .records_in .title {
+  width: 5.4rem;
+  display: flex;
+  justify-content: space-between;
+  color: #8956AA;
+  font-weight: 500;
+  font-size: 0.36rem;
+  margin: 2.49333rem auto 0.48rem;
+  text-align: center;
+}
+
+.records .records_in .title div {
+  width: 2.7rem;
+}
+
+.records .records_in ul {
+  width: 5.4rem;
+  height: 3.4rem;
+  margin: 0 auto;
+  overflow-y: scroll;
+}
+
+.records .records_in ul::-webkit-scrollbar {
+  display: none;
+}
+
+.records .records_in ul li {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  text-align: right;
+  margin-bottom: 0.28rem;
+}
+
+.records .records_in ul li div {
+  width: 2.7rem;
+  box-sizing: border-box;
+  padding-right: 0.64rem;
+  color: #8956AA;
+  font-size: 0.26667rem;
+  font-weight: 400;
+}
+
+.records .records_in ul li div p {
+  margin-bottom: 0.06667rem;
+}
+
+.records .records_in ul li div b {
+  font-size: 0.21333rem;
+}
+
+.records .records_in ul li .div2 {
+  text-align: center;
+  padding: 0;
+}
+
+.records .records_in ul .null .nulls {
+  text-align: center;
+  text-indent: 0.6rem;
+}
--- a/view/yinmeng/activity/2024-cityLove/css/index.scss
+++ b/view/yinmeng/activity/2024-cityLove/css/index.scss
@@ -0,0 +1,745 @@
+@function px2rem($px) {
+    @return $px / 75+rem;
+}
+
+html,
+body {
+    width: 100%;
+    background: #F9E4D6;
+}
+
+.rabbit {
+    z-index: 999;
+    width: px2rem(60);
+    height: px2rem(60);
+}
+
+// 返回按钮
+.back {
+    position: fixed;
+    top: px2rem(70);
+    left: px2rem(34);
+    z-index: 99;
+    width: px2rem(62);
+    height: px2rem(62);
+
+    img {
+        width: 100%;
+        height: 100%;
+    }
+
+    p {
+        color: #fff;
+        font-size: px2rem(32);
+        position: absolute;
+        width: 9rem;
+        left: 0;
+        top: 0;
+        height: 100%;
+        text-align: center;
+        line-height: px2rem(62);
+    }
+}
+
+.header {
+    width: px2rem(750);
+    height: px2rem(870);
+    background: url(../images/header.png) no-repeat;
+    background-size: 100% 100%;
+    position: relative;
+    margin: 0 auto px2rem(0);
+
+    .rule_icon {
+        position: absolute;
+        width: px2rem(132);
+        height: px2rem(73);
+        right: 0;
+        top: 4.6rem;
+    }
+
+    .tab {
+        width: px2rem(592);
+        height: px2rem(102);
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(573);
+        display: flex;
+        justify-content: space-between;
+
+        div {
+            width: px2rem(260);
+            height: 100%;
+        }
+
+        .tab1 {
+            background: url(../images/tab1.png) no-repeat;
+            background-size: 100% 100%;
+        }
+
+        .tab2 {
+            background: url(../images/tab2.png) no-repeat;
+            background-size: 100% 100%;
+        }
+
+        .act1 {
+            background: url(../images/tabAct1.png) no-repeat;
+            background-size: 100% 100%;
+        }
+
+        .act2 {
+            background: url(../images/tabAct2.png) no-repeat;
+            background-size: 100% 100%;
+        }
+    }
+}
+
+.page1 {
+    // display: none;
+
+    .page1Box1 {
+        width: px2rem(750);
+        height: px2rem(731);
+        display: block;
+        margin: -2.6rem auto 0rem;
+        position: relative;
+    }
+
+    .page1Box2 {
+        width: px2rem(750);
+        height: px2rem(933);
+        display: block;
+        margin: -1.1rem auto 0rem;
+        position: relative;
+    }
+
+    .page1Box3 {
+        width: px2rem(750);
+        height: px2rem(921);
+        display: block;
+        margin: -1.1rem auto 0rem;
+        position: relative;
+    }
+
+    .page1Box4 {
+        width: px2rem(750);
+        height: px2rem(1125);
+        margin: -1.1rem auto 0rem;
+        position: relative;
+        background: url(../images/page1Box4.png) no-repeat 100% 100%;
+        background-size: 100% 100%;
+
+        .left {
+            width: px2rem(261);
+            height: px2rem(63);
+            line-height: px2rem(61);
+            background: url(../images/page1Box4_left.png) no-repeat;
+            background-size: 100% 100%;
+            color: #FF5B8D;
+            font-size: px2rem(21);
+            position: absolute;
+            left: 0;
+            top: px2rem(202);
+            text-indent: 2.55rem;
+            font-weight: bold;
+        }
+
+        .right {
+            width: px2rem(261);
+            height: px2rem(63);
+            position: absolute;
+            right: 0;
+            top: px2rem(202);
+        }
+
+        .dayLimit {
+            width: px2rem(57);
+            height: px2rem(27);
+            line-height: px2rem(27);
+            text-align: center;
+            color: #fff;
+            font-size: px2rem(12);
+            font-weight: 500;
+            position: absolute;
+            top: px2rem(308);
+            background: url(../images/dayLimit.png) no-repeat;
+            background-size: 100% 100%;
+            text-indent: 0.05rem;
+            white-space: nowrap;
+        }
+
+        .dayLimit1 {
+            left: px2rem(211);
+        }
+
+        .dayLimit2 {
+            left: px2rem(412);
+        }
+
+        .dayLimit3 {
+            left: px2rem(617);
+        }
+
+        .convert {
+            width: px2rem(130);
+            height: px2rem(46);
+            position: absolute;
+        }
+
+        .convert1 {
+            left: px2rem(103);
+            top: px2rem(475);
+        }
+
+        .convert2 {
+            left: px2rem(303);
+            top: px2rem(475);
+        }
+
+        .convert3 {
+            left: px2rem(510);
+            top: px2rem(475);
+        }
+
+        .convert4 {
+            left: px2rem(103);
+            top: px2rem(709);
+        }
+
+        .convert5 {
+            left: px2rem(303);
+            top: px2rem(709);
+        }
+
+        .convert6 {
+            left: px2rem(510);
+            top: px2rem(709);
+        }
+
+        .convert7 {
+            left: px2rem(210);
+            top: px2rem(949);
+        }
+
+        .convert8 {
+            left: px2rem(409);
+            top: px2rem(949);
+        }
+    }
+}
+
+.page2 {
+    display: none;
+    width: px2rem(750);
+    height: px2rem(1542);
+    background: url(../images/page2.png) no-repeat;
+    background-size: 100% 100%;
+    position: relative;
+    margin: -2.6rem auto px2rem(100);
+
+    .first {
+        .left_ts {
+            width: px2rem(162);
+            height: px2rem(160);
+            position: absolute;
+            left: px2rem(162);
+            top: px2rem(201);
+            z-index: 2;
+        }
+
+        .right_ts {
+            width: px2rem(162);
+            height: px2rem(160);
+            position: absolute;
+            right: px2rem(162);
+            top: px2rem(201);
+            z-index: 2;
+        }
+
+        .left_tx {
+            width: px2rem(132);
+            height: px2rem(132);
+            border-radius: 50%;
+            position: absolute;
+            left: px2rem(175);
+            top: px2rem(217);
+        }
+
+        .right_tx {
+            width: px2rem(132);
+            height: px2rem(132);
+            border-radius: 50%;
+            position: absolute;
+            right: px2rem(175);
+            top: px2rem(217);
+        }
+
+        .score {
+            width: 1.5rem;
+            text-align: center;
+            -webkit-text-stroke: px2rem(1) #FE5A9F;
+            /* Safari */
+            font-size: px2rem(21);
+            color: #fff;
+            position: absolute;
+            left: 50%;
+            transform: translateX(-50%);
+            top: 3.82667rem;
+            font-weight: bold;
+        }
+
+        .leftNick {
+            width: px2rem(162);
+            text-align: center;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            position: absolute;
+            left: px2rem(168);
+            top: px2rem(375);
+            color: #B8004E;
+            font-weight: bold;
+            font-size: px2rem(21);
+        }
+
+        .rightNick {
+            width: px2rem(162);
+            text-align: center;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            position: absolute;
+            right: px2rem(168);
+            top: px2rem(375);
+            color: #B8004E;
+            font-weight: bold;
+            font-size: px2rem(21);
+        }
+    }
+
+    .notFirst {
+        width: px2rem(666);
+        height: 12rem;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(535);
+        overflow-y: scroll;
+
+        &::-webkit-scrollbar {
+            display: none;
+        }
+
+        li {
+            width: px2rem(666);
+            height: px2rem(137);
+            background: url(../images/listBg.png) no-repeat;
+            background-size: 100% 100%;
+            position: relative;
+            overflow: hidden;
+
+            .num {
+                width: px2rem(50);
+                height: 100%;
+                line-height: px2rem(137);
+                text-align: center;
+                color: #B16B74;
+                font-size: px2rem(23);
+                font-weight: 500;
+                float: left;
+                margin-left: 0.52rem;
+                margin-right: px2rem(15);
+            }
+
+            .left_tx {
+                width: px2rem(82);
+                height: px2rem(82);
+                border-radius: px2rem(82);
+                float: left;
+                margin-top: px2rem(29);
+                border: px2rem(2) solid #FFABC7;
+                margin-right: px2rem(14);
+            }
+
+            .right_tx {
+                width: px2rem(82);
+                height: px2rem(82);
+                border-radius: px2rem(82);
+                float: left;
+                margin-top: px2rem(29);
+                border: px2rem(2) solid #FFABC7;
+            }
+
+            .love {
+                width: px2rem(77);
+                height: px2rem(68);
+                position: absolute;
+                left: px2rem(158);
+                top: px2rem(38);
+            }
+
+            .nickLeft {
+                width: 2.2rem;
+                color: #FF658E;
+                font-size: px2rem(21);
+                font-weight: 500;
+                position: absolute;
+                left: px2rem(300);
+                top: px2rem(44);
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+
+            .nickRight {
+                width: 2.2rem;
+                color: #FF658E;
+                font-size: px2rem(21);
+                font-weight: 500;
+                position: absolute;
+                left: px2rem(300);
+                top: px2rem(74);
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+
+            .score {
+                float: right;
+                height: 100%;
+                line-height: px2rem(137);
+                color: #FE5F93;
+                font-size: px2rem(24);
+                margin-right: px2rem(75);
+                font-weight: 500;
+            }
+        }
+    }
+
+    .my {
+        width: px2rem(750);
+        height: 3.16rem;
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        background: url(../images/my.png) no-repeat;
+        background-size: 100% 100%;
+        background: url(../images/my2.png) no-repeat;
+        background-size: 100% 100%;
+        transition: all .3s;
+        z-index: 3;
+
+        .more {
+            width: px2rem(93);
+            height: px2rem(93);
+            position: absolute;
+            right: px2rem(7);
+            top: px2rem(-31);
+        }
+
+        ul {
+            width: 8.88rem;
+            height: 1.82667rem;
+            margin: 1.10667rem auto 0;
+            overflow-y: hidden;
+
+            &::-webkit-scrollbar {
+                display: none;
+            }
+
+            li {
+                width: 100%;
+                height: px2rem(137);
+                background: url(../images/myList.png) no-repeat;
+                background-size: 100% 100%;
+                position: relative;
+                margin-bottom: px2rem(8);
+                overflow: hidden;
+
+                .num {
+                    width: px2rem(50);
+                    height: 100%;
+                    line-height: px2rem(137);
+                    text-align: center;
+                    color: #B16B74;
+                    font-size: px2rem(23);
+                    font-weight: 500;
+                    float: left;
+                    margin-left: 0.52rem;
+                    margin-right: px2rem(15);
+                }
+
+                .left_tx {
+                    width: px2rem(82);
+                    height: px2rem(82);
+                    border-radius: px2rem(82);
+                    float: left;
+                    margin-top: px2rem(29);
+                    border: px2rem(2) solid #FFABC7;
+                    margin-right: px2rem(14);
+                }
+
+                .right_tx {
+                    width: px2rem(82);
+                    height: px2rem(82);
+                    border-radius: px2rem(82);
+                    float: left;
+                    margin-top: px2rem(29);
+                    border: px2rem(2) solid #FFABC7;
+                }
+
+                .love {
+                    width: px2rem(77);
+                    height: px2rem(68);
+                    position: absolute;
+                    left: px2rem(158);
+                    top: px2rem(38);
+                }
+
+                .nickLeft {
+                    width: 2.2rem;
+                    color: #FF658E;
+                    font-size: px2rem(21);
+                    font-weight: 500;
+                    position: absolute;
+                    left: px2rem(300);
+                    top: px2rem(44);
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+
+                .nickRight {
+                    width: 2.2rem;
+                    color: #FF658E;
+                    font-size: px2rem(21);
+                    font-weight: 500;
+                    position: absolute;
+                    left: px2rem(300);
+                    top: px2rem(74);
+                    overflow: hidden;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                }
+
+                .score {
+                    float: right;
+                    height: 100%;
+                    line-height: px2rem(137);
+                    color: #FE5F93;
+                    font-size: px2rem(24);
+                    margin-right: px2rem(75);
+                    font-weight: 500;
+                }
+
+            }
+
+            .null {
+                background: none;
+                text-align: center;
+                line-height: px2rem(137);
+                color: #FF658E;
+                font-size: px2rem(30);
+                font-weight: 500;
+            }
+        }
+    }
+}
+
+.rule {
+    position: fixed;
+    z-index: 99;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, .6);
+    display: none;
+
+    .rule_in {
+        width: px2rem(683);
+        height: px2rem(989);
+        background: url(../images/ruleBg.png) no-repeat;
+        background-size: 100% 100%;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+
+        .tab {
+            width: px2rem(498);
+            height: px2rem(92);
+            display: flex;
+            justify-content: space-between;
+            margin: px2rem(180) auto px2rem(19);
+
+            div {
+                width: px2rem(235);
+                height: px2rem(92);
+            }
+
+            .tab1 {
+                background: url(../images/ruleTab1.png) no-repeat;
+                background-size: 100% 100%;
+            }
+
+            .tab2 {
+                background: url(../images/ruleTab2.png) no-repeat;
+                background-size: 100% 100%;
+            }
+
+            .act1 {
+                background: url(../images/ruleTabAct1.png) no-repeat;
+                background-size: 100% 100%;
+            }
+
+            .act2 {
+                background: url(../images/ruleTabAct2.png) no-repeat;
+                background-size: 100% 100%;
+            }
+        }
+
+        .box {
+            width: px2rem(586);
+            height: 8.5rem;
+            margin: 0 auto 0;
+            overflow-y: scroll;
+
+            &::-webkit-scrollbar {
+                display: none;
+            }
+
+            img {
+                display: block;
+                width: 100%;
+            }
+
+            .img2 {
+                display: none;
+            }
+        }
+
+        .box2 {
+            width: px2rem(622);
+        }
+    }
+}
+
+.end {
+    position: fixed;
+    z-index: 99;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, .6);
+    display: none;
+
+    .end_in {
+        width: px2rem(525);
+        height: px2rem(411);
+        background: url(../images/endBg.png) no-repeat;
+        background-size: 100% 100%;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+    }
+
+    .but {
+        width: px2rem(236);
+        height: px2rem(92);
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: px2rem(61);
+    }
+}
+
+.records {
+    position: fixed;
+    z-index: 99;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, .6);
+    display: none;
+
+    .records_in {
+        width: px2rem(721);
+        height: px2rem(636);
+        background: url(../images/recordsBg.png) no-repeat;
+        background-size: 100% 100%;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        overflow: hidden;
+
+        .title {
+            width: 5.4rem;
+            display: flex;
+            justify-content: space-between;
+            color: #8956AA;
+            font-weight: 500;
+            font-size: px2rem(27);
+            margin: px2rem(187) auto px2rem(36);
+            text-align: center;
+
+            div {
+                width: 2.7rem;
+            }
+        }
+
+        ul {
+            width: 5.4rem;
+            height: 3.4rem;
+            margin: 0 auto;
+            overflow-y: scroll;
+
+            &::-webkit-scrollbar {
+                display: none;
+            }
+
+            li {
+                width: 100%;
+                display: flex;
+                justify-content: space-between;
+                text-align: right;
+                margin-bottom: px2rem(21);
+
+                div {
+                    width: 2.7rem;
+                    box-sizing: border-box;
+                    padding-right: 0.64rem;
+                    color: #8956AA;
+                    font-size: px2rem(20);
+                    font-weight: 400;
+
+                    p {
+                        margin-bottom: px2rem(5);
+                    }
+
+                    b {
+                        font-size: px2rem(16);
+                    }
+                }
+
+                .div2 {
+                    text-align: center;
+                    padding: 0;
+                }
+            }
+
+            .null {
+                .nulls {
+                    text-align: center;
+                    text-indent: 0.6rem;
+                }
+            }
+        }
+    }
+}
--- a/view/yinmeng/activity/2024-cityLove/images/convert.png
+++ b/view/yinmeng/activity/2024-cityLove/images/convert.png
--- a/view/yinmeng/activity/2024-cityLove/images/convertOut.png
+++ b/view/yinmeng/activity/2024-cityLove/images/convertOut.png
--- a/view/yinmeng/activity/2024-cityLove/images/dayLimit.png
+++ b/view/yinmeng/activity/2024-cityLove/images/dayLimit.png
--- a/view/yinmeng/activity/2024-cityLove/images/endBg.png
+++ b/view/yinmeng/activity/2024-cityLove/images/endBg.png
--- a/view/yinmeng/activity/2024-cityLove/images/endBut.png
+++ b/view/yinmeng/activity/2024-cityLove/images/endBut.png
--- a/view/yinmeng/activity/2024-cityLove/images/header.png
+++ b/view/yinmeng/activity/2024-cityLove/images/header.png
--- a/view/yinmeng/activity/2024-cityLove/images/left_ts.png
+++ b/view/yinmeng/activity/2024-cityLove/images/left_ts.png
--- a/view/yinmeng/activity/2024-cityLove/images/listBg.png
+++ b/view/yinmeng/activity/2024-cityLove/images/listBg.png
--- a/view/yinmeng/activity/2024-cityLove/images/logo.png
+++ b/view/yinmeng/activity/2024-cityLove/images/logo.png
--- a/view/yinmeng/activity/2024-cityLove/images/love.png
+++ b/view/yinmeng/activity/2024-cityLove/images/love.png
--- a/view/yinmeng/activity/2024-cityLove/images/more.png
+++ b/view/yinmeng/activity/2024-cityLove/images/more.png
--- a/view/yinmeng/activity/2024-cityLove/images/my.png
+++ b/view/yinmeng/activity/2024-cityLove/images/my.png
--- a/view/yinmeng/activity/2024-cityLove/images/my2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/my2.png
--- a/view/yinmeng/activity/2024-cityLove/images/myList.png
+++ b/view/yinmeng/activity/2024-cityLove/images/myList.png
--- a/view/yinmeng/activity/2024-cityLove/images/notConvert.png
+++ b/view/yinmeng/activity/2024-cityLove/images/notConvert.png
--- a/view/yinmeng/activity/2024-cityLove/images/page1Box1.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page1Box1.png
--- a/view/yinmeng/activity/2024-cityLove/images/page1Box2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page1Box2.png
--- a/view/yinmeng/activity/2024-cityLove/images/page1Box3.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page1Box3.png
--- a/view/yinmeng/activity/2024-cityLove/images/page1Box4.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page1Box4.png
--- a/view/yinmeng/activity/2024-cityLove/images/page1Box4_left.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page1Box4_left.png
--- a/view/yinmeng/activity/2024-cityLove/images/page1Box4_right.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page1Box4_right.png
--- a/view/yinmeng/activity/2024-cityLove/images/page2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/page2.png
--- a/view/yinmeng/activity/2024-cityLove/images/recordsBg.png
+++ b/view/yinmeng/activity/2024-cityLove/images/recordsBg.png
--- a/view/yinmeng/activity/2024-cityLove/images/right_ts.png
+++ b/view/yinmeng/activity/2024-cityLove/images/right_ts.png
--- a/view/yinmeng/activity/2024-cityLove/images/rule1.png
+++ b/view/yinmeng/activity/2024-cityLove/images/rule1.png
--- a/view/yinmeng/activity/2024-cityLove/images/rule2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/rule2.png
--- a/view/yinmeng/activity/2024-cityLove/images/ruleBg.png
+++ b/view/yinmeng/activity/2024-cityLove/images/ruleBg.png
--- a/view/yinmeng/activity/2024-cityLove/images/ruleTab1.png
+++ b/view/yinmeng/activity/2024-cityLove/images/ruleTab1.png
--- a/view/yinmeng/activity/2024-cityLove/images/ruleTab2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/ruleTab2.png
--- a/view/yinmeng/activity/2024-cityLove/images/ruleTabAct1.png
+++ b/view/yinmeng/activity/2024-cityLove/images/ruleTabAct1.png
--- a/view/yinmeng/activity/2024-cityLove/images/ruleTabAct2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/ruleTabAct2.png
--- a/view/yinmeng/activity/2024-cityLove/images/rule_icon.png
+++ b/view/yinmeng/activity/2024-cityLove/images/rule_icon.png
--- a/view/yinmeng/activity/2024-cityLove/images/tab1.png
+++ b/view/yinmeng/activity/2024-cityLove/images/tab1.png
--- a/view/yinmeng/activity/2024-cityLove/images/tab2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/tab2.png
--- a/view/yinmeng/activity/2024-cityLove/images/tabAct1.png
+++ b/view/yinmeng/activity/2024-cityLove/images/tabAct1.png
--- a/view/yinmeng/activity/2024-cityLove/images/tabAct2.png
+++ b/view/yinmeng/activity/2024-cityLove/images/tabAct2.png
--- a/view/yinmeng/activity/2024-cityLove/images/travel/back.png
+++ b/view/yinmeng/activity/2024-cityLove/images/travel/back.png
--- a/view/yinmeng/activity/2024-cityLove/index.html
+++ b/view/yinmeng/activity/2024-cityLove/index.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>全城热恋</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/index.css">
+</head>
+
+<body>
+    <!-- 顶部返回 -->
+    <div class="back">
+        <img src="./images/travel/back.png" alt="">
+    </div>
+    <!-- 头部 -->
+    <div class="header">
+        <!-- 规则Icon -->
+        <img src="./images/rule_icon.png" alt="" class="rule_icon">
+        <!-- tab -->
+        <div class="tab">
+            <div class="tab1 act1"></div>
+            <div class="tab2"></div>
+        </div>
+    </div>
+    <!-- 热恋攻略 -->
+    <div class="page1">
+        <img src="./images/page1Box1.png" alt="" class="page1Box1">
+        <img src="./images/page1Box2.png" alt="" class="page1Box2">
+        <img src="./images/page1Box3.png" alt="" class="page1Box3">
+        <div class="page1Box4">
+            <div class="left">0</div>
+            <img src="./images/page1Box4_right.png" alt="" class="right">
+            <div class="dayLimit dayLimit1">日限:0</div>
+            <div class="dayLimit dayLimit2">日限:0</div>
+            <div class="dayLimit dayLimit3">日限:0</div>
+            <img src="./images/notConvert.png" alt="" class="convert convert1">
+            <img src="./images/notConvert.png" alt="" class="convert convert2">
+            <img src="./images/notConvert.png" alt="" class="convert convert3">
+            <img src="./images/notConvert.png" alt="" class="convert convert4">
+            <img src="./images/notConvert.png" alt="" class="convert convert5">
+            <img src="./images/notConvert.png" alt="" class="convert convert6">
+            <img src="./images/notConvert.png" alt="" class="convert convert7">
+            <img src="./images/notConvert.png" alt="" class="convert convert8">
+        </div>
+    </div>
+    <!-- 心跳加速 -->
+    <div class="page2">
+        <!-- 第一名 -->
+        <div class="first">
+            <img src="./images/logo.png" alt="" class="left_tx">
+            <img src="./images/logo.png" alt="" class="right_tx">
+            <img src="./images/left_ts.png" alt="" class="left_ts">
+            <img src="./images/right_ts.png" alt="" class="right_ts">
+            <div class="score"></div>
+            <div class="leftNick"></div>
+            <div class="rightNick"></div>
+        </div>
+        <!-- 非第一名 -->
+        <ul class="notFirst">
+            <li>
+                <div class="num">2</div>
+                <img src="./images/logo.png" alt="" class="left_tx">
+                <img src="./images/logo.png" alt="" class="right_tx">
+                <img src="./images/love.png" alt="" class="love">
+                <div class="nickLeft">虚位以待</div>
+                <div class="nickRight">虚位以待</div>
+                <div class="score">0</div>
+            </li>
+        </ul>
+        <div class="my">
+            <img src="./images/more.png" alt="" class="more">
+            <ul>
+                <li>
+                    <div class="num">2</div>
+                    <img src="./images/logo.png" alt="" class="left_tx">
+                    <img src="./images/logo.png" alt="" class="right_tx">
+                    <img src="./images/love.png" alt="" class="love">
+                    <div class="nickLeft">虚位以待</div>
+                    <div class="nickRight">虚位以待</div>
+                    <div class="score">0</div>
+                </li>
+                <li>
+                    <div class="num">3</div>
+                    <img src="./images/logo.png" alt="" class="left_tx">
+                    <img src="./images/logo.png" alt="" class="right_tx">
+                    <img src="./images/love.png" alt="" class="love">
+                    <div class="nickLeft">虚位以待</div>
+                    <div class="nickRight">虚位以待</div>
+                    <div class="score">0</div>
+                </li>
+                <li>
+                    <div class="num">4</div>
+                    <img src="./images/logo.png" alt="" class="left_tx">
+                    <img src="./images/logo.png" alt="" class="right_tx">
+                    <img src="./images/love.png" alt="" class="love">
+                    <div class="nickLeft">虚位以待</div>
+                    <div class="nickRight">虚位以待</div>
+                    <div class="score">0</div>
+                </li>
+                <li>
+                    <div class="num">5</div>
+                    <img src="./images/logo.png" alt="" class="left_tx">
+                    <img src="./images/logo.png" alt="" class="right_tx">
+                    <img src="./images/love.png" alt="" class="love">
+                    <div class="nickLeft">虚位以待</div>
+                    <div class="nickRight">虚位以待</div>
+                    <div class="score">0</div>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <!-- 活动规则弹窗 -->
+    <div class="rule">
+        <div class="rule_in">
+            <div class="tab">
+                <div class="tab1 act1"></div>
+                <div class="tab2"></div>
+            </div>
+            <div class="box">
+                <img src="./images/rule1.png" alt="" class="img1">
+                <img src="./images/rule2.png" alt="" class="img2">
+            </div>
+        </div>
+    </div>
+    <!-- 活动结束弹窗 -->
+    <div class="end">
+        <div class="end_in">
+            <img src="./images/endBut.png" alt="" class="but">
+        </div>
+    </div>
+    <!-- 兑换记录弹窗 -->
+    <div class="records">
+        <div class="records_in">
+            <div class="title">
+                <div>兑换时间</div>
+                <div>商品</div>
+            </div>
+            <ul>
+                <li>
+                    <div>
+                        <p>2024/01/22</p>
+                        <b>23:59:59</b>
+                    </div>
+                    <div class="div2">
+                        <p>礼物名称</p>
+                        <b>XX天</b>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="./js/index.js"></script>
--- a/view/yinmeng/activity/2024-cityLove/js/index.js
+++ b/view/yinmeng/activity/2024-cityLove/js/index.js
@@ -0,0 +1,377 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+if (env == 'test') {
+    new VConsole();
+}
+var langReplace;
+var localLang;
+// 封装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'
+    })
+}
+var listMoreBool = true;
+var taskValue = null;
+var isLock = true;
+var page = 1;
+// 初始化函数
+$(function () {
+    getInfoFromClient();
+    setTimeout(function () {
+        // 页面全屏
+        if (browser.app) {
+            if (browser.android) {
+                window.androidJsObj.initShowNav(false)
+            } else {
+                window.webkit.messageHandlers.initShowNav.postMessage(0)
+            }
+        };
+        // 顶部返回事件
+        $('.back').click(() => {
+            if (browser.android) {
+                window.androidJsObj.closeWebView()
+            } else {
+                window.webkit.messageHandlers.closeWebView.postMessage(null)
+            }
+        })
+        getCurrency();
+        activityCodeInfo();
+    }, 100)
+})
+
+// 获取时间接口
+function activityCodeInfo() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/activity/info',
+        data: { activityCode: "ACT_2024_HOT_LOVE" },
+        success(res) {
+            if (res.code === 200) {
+                // 判断活动结束时间
+                if (res.timestamp > res.data.endTime) {
+                    $('.end').show();
+                }
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤')
+        }
+    })
+}
+// 配置接口
+function getCurrency() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/act/hotLove/currency',
+        data: { redisKey: 'act_user_task_extra_data' },
+        success(res) {
+            if (res.code === 200) {
+                taskValue = res.data;
+                $('.page1 .page1Box4 .left').text(res.data);
+                showLoading()
+                networkRequest({
+                    type: 'get',
+                    url: urlPrefix + '/act/hotLove/rewardList',
+                    data: { activityCode: 'ACT_2024_HOT_LOVE', componentCode: "RE_LIAN_SHANG_DIAN" },
+                    success(res) {
+                        if (res.code === 200) {
+                            res.data.forEach((res, i) => {
+                                if (res.stockValue <= 0) {
+                                    $(`.page1 .page1Box4 .convert${i + 1}`).attr("src", './images/convertOut.png');
+                                    $(`.page1 .page1Box4 .convert${i + 1}`).attr("click", 0);
+                                } else if (taskValue >= res.taskValue) {
+                                    $(`.page1 .page1Box4 .convert${i + 1}`).attr("src", './images/convert.png');
+                                    $(`.page1 .page1Box4 .convert${i + 1}`).attr("click", 1);
+                                } else {
+                                    $(`.page1 .page1Box4 .convert${i + 1}`).attr("src", './images/notConvert.png');
+                                    $(`.page1 .page1Box4 .convert${i + 1}`).attr("click", 0);
+                                }
+                                $(`.page1 .page1Box4 .convert${i + 1}`).attr('taskCode', res.taskCode);
+                                $(`.page1 .page1Box4 .convert${i + 1}`).attr('conditionCode', res.conditionCode);
+                                $(`.page1 .page1Box4 .dayLimit${i + 1}`).text(`日限:${res.stockValue}`)
+                            })
+                        } else {
+                            toastMsg(res.message)
+                        }
+                        hideLoading(layerIndex)
+                    },
+                    error(err) {
+                        hideLoading(layerIndex)
+                        toastMsg('网络错误')
+                    }
+                })
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+        }
+    })
+}
+// tab切换
+$('.header .tab div').click(function () {
+    var i = $(this).index() + 1;
+    $('.header .tab div').removeClass('act1').removeClass('act2');
+    $(this).addClass(`act${i}`);
+    $(`.page${i}`).show();
+    i == 1 ? $('.page2').hide() : $('.page1').hide();
+    if (i == 2) {
+        getRank();
+    }
+})
+
+// 榜单接口
+function getRank() {
+    $('.page2 .my ul li').remove();
+    $('.page2 .notFirst li').remove();
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/act/2024Valentines/cpRank/getRank',
+        data: { pageSize: 30 },
+        success(res) {
+            if (res.code === 200) {
+                var first = res.data.rankList.slice(0, 1);
+                var notFirst = res.data.rankList.slice(1);
+                // 处理第一名
+                if (first.length < 1) {
+                    let arr = new Array(3 - first.length).fill({
+                        leftAvatar: './images/logo.png',
+                        rightAvatar: './images/logo.png',
+                        leftNick: '虚位以待',
+                        rightNick: '虚位以待',
+                        score: "0"
+                    })
+                    first.push(...arr)
+                }
+                first.forEach(res => {
+                    $('.page2 .first .left_tx').attr('src', res.leftAvatar);
+                    $('.page2 .first .right_tx').attr('src', res.rightAvatar);
+                    $('.page2 .first .leftNick').text(res.leftNick)
+                    $('.page2 .first .rightNick').text(res.rightNick)
+                    $('.page2 .first .score').text(unitProcessing(res.score, 10000, 1, 'w'))
+                })
+                // 处理非第一名
+                var str = '';
+                notFirst.forEach((res, i) => {
+                    str += `
+                        <li>
+                            <div class="num">${res.ranking}</div>
+                            <img src="${res.leftAvatar}" alt="" class="left_tx">
+                            <img src="${res.rightAvatar}" alt="" class="right_tx">
+                            <img src="./images/love.png" alt="" class="love">
+                            <div class="nickLeft">${res.leftNick}</div>
+                            <div class="nickRight">${res.rightNick}</div>
+                            <div class="score">${unitProcessing(res.score, 10000, 1, 'w')}</div>
+                        </li>`
+                })
+                $('.page2 .notFirst').append(str);
+                // 处理自己
+                var strMy = '';
+                if (res.data.meRankList.length <= 0) {
+                    $('.page2 .my .more').hide();
+                    strMy += `<li class="null">暂无组合~</li>`
+                } else {
+                    $('.page2 .my .more').show();
+                    res.data.meRankList.forEach((res, i) => {
+                        strMy += `
+                        <li>
+                            <div class="num">${res.ranking == 0 ? '30+' : res.ranking}</div>
+                            <img src="${res.leftAvatar}" alt="" class="left_tx">
+                            <img src="${res.rightAvatar}" alt="" class="right_tx">
+                            <img src="./images/love.png" alt="" class="love">
+                            <div class="nickLeft">${res.leftNick}</div>
+                            <div class="nickRight">${res.rightNick}</div>
+                            <div class="score">${unitProcessing(res.score, 10000, 1, 'w')}</div>
+                        </li>
+                    `
+                    })
+                }
+                $('.page2 .my ul').append(strMy)
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+
+        }
+    })
+}
+// 榜单查看更多按钮
+$('.page2 .my .more').click(function () {
+    if (listMoreBool) {
+        $('.page2 .my').css({ "height": '7.76rem', "background": "url(./images/my2.png) no-repeat", "background-size": "100% 100%" });
+        $('.page2 .my .more').css({ "transform": "rotate(180deg)" });
+        $('.page2 .my ul').css({ "height": "6.4rem", "overflow-y": "scroll" });
+        bodyScroolFun(true);
+    } else {
+        $('.page2 .my').css({ "height": '3.16rem', "background": "url(./images/my.png) no-repeat", "background-size": "100% 100%" });
+        $('.page2 .my .more').css({ "transform": "rotate(0deg)" });
+        $('.page2 .my ul').css({ "height": "1.82667rem", "overflow-y": "hidden" });
+        bodyScroolFun(false);
+    }
+    $('.page2 .my ul').scrollTop(0);
+    listMoreBool = !listMoreBool;
+})
+// 活动规则切换
+$('.rule .rule_in .tab div').click(function () {
+    var i = $(this).index() + 1;
+    $('.rule .rule_in .tab div').removeClass('act1').removeClass('act2');
+    $(this).addClass(`act${i}`);
+    // $(`.rule .rule_in .box img`).attr('src', `./images/rule${i}.png`);
+    $(`.rule .rule_in .box .img1,.rule .rule_in .box .img2`).hide();
+    $(`.rule .rule_in .box .img${i}`).show();
+    i == 1 ? $('.rule .rule_in .box').removeClass('box2') : $('.rule .rule_in .box').addClass('box2');
+    return false;
+})
+// 打开活动规则
+$('.header .rule_icon').click(function () {
+    $('.rule').show();
+    bodyScroolFun(true);
+})
+// 关闭活动规则
+$('.rule').click(function () {
+    $('.rule').hide();
+    bodyScroolFun(false);
+})
+// 关闭活动结束
+$('.end .but').click(function () {
+    $('.end').hide();
+    bodyScroolFun(false);
+    $('.header .tab div').removeClass('act1').removeClass('act2');
+    $('.header .tab .tab2').addClass(`act${2}`);
+    $(`.page${2}`).show();
+    $('.page1').hide();
+    getRank();
+})
+// 打开记录弹窗
+$('.page1 .page1Box4 .right').click(function () {
+    $('.records .records_in ul li').remove();
+    isLock = true;
+    page = 1;
+    record(page);
+    bodyScroolFun(true);
+})
+// 关闭记录弹窗
+$('.records').click(function () {
+    $('.records').hide();
+    bodyScroolFun(false);
+})
+// 兑换按钮
+$('.page1 .page1Box4 .convert').click(function () {
+    var taskcode = $(this).attr('taskcode');
+    var conditionCode = $(this).attr('conditionCode');
+    var bool = $(this).attr('click');
+    if (bool == 1) {
+        exchange(taskcode, conditionCode);
+    }
+})
+// 兑换接口
+function exchange(taskCode, conditionCode) {
+    showLoading()
+    networkRequest({
+        type: 'post',
+        url: urlPrefix + '/act/hotLove/exchange',
+        data: { taskCode, activityCode: 'ACT_2024_HOT_LOVE', conditionCode, },
+        success(res) {
+            if (res.code === 200) {
+                getCurrency();
+                toastMsg('兑换成功')
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+        }
+    })
+}
+// 兑换记录滚动
+$('.records .records_in ul').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.records .records_in ul')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        if (isLock) {
+            // 请求下一页
+            page++;
+            record(page)
+            isLock = false;
+        }
+    }
+})
+
+// 记录接口
+function record(pageNum) {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/activity/task/user/record/page',
+        data: { activityCode: 'ACT_2024_HOT_LOVE', componentCode: 'RE_LIAN_SHANG_DIAN', pageNum, pageSize: 10 },
+        success(res) {
+            if (res.code === 200) {
+                var str = '';
+                if (res.data.records.length <= 0 && pageNum == 1) {
+                    str += `<li class="null"><div class="nulls">暂无</div><div class="nulls">暂无</div></li>`
+                    isLock = false;
+                } else {
+                    res.data.records.forEach(res => {
+                        str += `
+                    <li>
+                        <div>
+                            <p>${dateFormat(res.createTime, "yyyy/MM/dd")}</p>
+                            <b>${dateFormat(res.createTime, "hh/mm/ss")}</b>
+                        </div>
+                        <div class="div2">
+                            <p>${res.rewardName}</p>
+                            <b>${res.rewardNum}${rewardTypeFun(res.rewardType).unit}</b>
+                        </div>
+                    </li>
+                    `})
+                }
+                $('.records .records_in ul').append(str);
+                $('.records').show();
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('网络错误')
+
+        }
+    })
+}
--- a/view/yinmeng/common/js/common2.js
+++ b/view/yinmeng/common/js/common2.js
@@ -674,3 +674,24 @@ function networkRequest (reqObj = {}, type) {
    const response = $.ajax(reqObj);
    return response;
 }
+function rewardTypeFun(type) {
+    if (type == "HEADWEAR") {
+        return { name: "头饰", unit: '天' };
+    } else if (type == "NAMEPLATE") {
+        return { name: "铭牌", unit: '天' };
+    } else if (type == "CHATBUBBLE") {
+        return { name: "气泡", unit: '天' };
+    } else if (type == "INFOCARD") {
+        return { name: "资料卡", unit: '天' };
+    } else if (type == "CAR") {
+        return { name: "座驾", unit: '天' };
+    } else if (type == "GIFT") {
+        return { name: "礼物", unit: '个' };
+    } else if (type == "DIAMOND") {
+        return { name: "钻石", unit: '个' };
+    } else if (type == "GOLD") {
+        return { name: "金币", unit: '个' };
+    } else if (type == "EMPTY") {
+        return { name: nick, unit: '个' };
+    }
+}
--- a/view/yinmeng/home/index.html
+++ b/view/yinmeng/home/index.html
@@ -29,7 +29,7 @@

  <!-- <link rel="stylesheet" href="./home/css/reset.css"> -->
  <link rel="stylesheet" href="./css/reset.css">
-  <link rel="stylesheet" href="./css/index.css">
+  <link rel="stylesheet" href="./css/index.css?v=1.0">
  <!-- <link rel="stylesheet" href="./home/css/index.css"> -->
  <link rel="stylesheet" href="./css/swiper.min.css">
  <!-- <script src="./js/flexible.js"></script> -->
@@ -160,7 +160,7 @@
  <script src="http://static.lkme.cc/linkedme.min.js"></script>
  <script src="./js/utf.js"></script>
  <script src="./js/swiper.min.js"></script>
-  <script src="./js/index.js?v=2.3"></script>
+  <script src="./js/index.js?v=2.4"></script>
 </body>

 </html>
--- a/view/yinmeng/modules/identity/js/new.js
+++ b/view/yinmeng/modules/identity/js/new.js
@@ -209,7 +209,7 @@ $(function () {
                    identityNumber: encryptDes(personId, "1ea53d260ecf11e7b56e00163e046a26"),
                    metaInfo: JSON.stringify(metaInfo),
                    phone: encryptDes( phone, "1ea53d260ecf11e7b56e00163e046a26"),
-                    returnUrl: urlPrefix + `/yinmeng/modules/identity/new.html?uid=${pubInfo.uid}&ticket=${pubInfo.ticket}`,
+                    returnUrl: tranUrl + `/yinmeng/modules/identity/new.html?uid=${pubInfo.uid}&ticket=${pubInfo.ticket}`,
                    uid: pubInfo.uid,
                    username: encryptDes(name, "1ea53d260ecf11e7b56e00163e046a26"),
                };
--- a/view/yinmeng/modules/identity/new.html
+++ b/view/yinmeng/modules/identity/new.html
@@ -91,7 +91,7 @@
    <script src="../../common/js/crypto-js.js"></script>
    <script src="../../common/js/layer.js"></script>
    <script src="./js/jsvm_all.js"></script>
-    <script src="./js/new.js?=2.3"></script>
+    <script src="./js/new.js?=2.4"></script>
 </body>

 </html>
Author	SHA1	Message	Date
dragon	c614ead08f	新增留意活动	2024-05-28 21:24:28 +08:00
dragon	fec9ac7a45	修复热恋活动bug	2024-05-16 17:27:29 +08:00
dragon	14db22d7e6	新增热恋全城活动	2024-05-15 19:09:00 +08:00
dragon	aa30bc011a	传值回调	2024-04-25 18:20:32 +08:00
dragon	d575f38a9e	清除缓存	2024-04-19 14:15:21 +08:00