修改sdk，修复隐私曾策

厨房：新增动效
厨房：更改规则
2023-03-15 15:22:21 +08:00 · 2023-03-10 11:38:51 +08:00 · 2023-03-09 17:50:35 +08:00 · 2023-03-09 17:50:32 +08:00 · 2023-03-09 17:50:29 +08:00 · 2023-03-09 17:50:27 +08:00
240 changed files with 12954 additions and 820 deletions
--- a/view/peko/activity/2023-Valentines-Day/css/index.css
+++ b/view/peko/activity/2023-Valentines-Day/css/index.css
--- a/view/peko/activity/2023-Valentines-Day/css/index.scss
+++ b/view/peko/activity/2023-Valentines-Day/css/index.scss
--- a/view/peko/activity/2023-Valentines-Day/css/swiper-bundle.min.css
+++ b/view/peko/activity/2023-Valentines-Day/css/swiper-bundle.min.css
--- a/view/peko/activity/2023-Valentines-Day/images/arrows.png
+++ b/view/peko/activity/2023-Valentines-Day/images/arrows.png
--- a/view/peko/activity/2023-Valentines-Day/images/awardBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/awardBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/bling0.png
+++ b/view/peko/activity/2023-Valentines-Day/images/bling0.png
--- a/view/peko/activity/2023-Valentines-Day/images/bling1.png
+++ b/view/peko/activity/2023-Valentines-Day/images/bling1.png
--- a/view/peko/activity/2023-Valentines-Day/images/bling2.png
+++ b/view/peko/activity/2023-Valentines-Day/images/bling2.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_act.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_act.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_add.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_add.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_change.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_change.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_cp.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_cp.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_cut.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_cut.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_noact.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_noact.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_rule.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_rule.png
--- a/view/peko/activity/2023-Valentines-Day/images/btn_sure.png
+++ b/view/peko/activity/2023-Valentines-Day/images/btn_sure.png
--- a/view/peko/activity/2023-Valentines-Day/images/change_record.png
+++ b/view/peko/activity/2023-Valentines-Day/images/change_record.png
--- a/view/peko/activity/2023-Valentines-Day/images/chargeBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/chargeBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/circle.png
+++ b/view/peko/activity/2023-Valentines-Day/images/circle.png
--- a/view/peko/activity/2023-Valentines-Day/images/close.png
+++ b/view/peko/activity/2023-Valentines-Day/images/close.png
--- a/view/peko/activity/2023-Valentines-Day/images/cpAward.png
+++ b/view/peko/activity/2023-Valentines-Day/images/cpAward.png
--- a/view/peko/activity/2023-Valentines-Day/images/cpAwardBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/cpAwardBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/cpRecordBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/cpRecordBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/drawBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/drawBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/get_letter.png
+++ b/view/peko/activity/2023-Valentines-Day/images/get_letter.png
--- a/view/peko/activity/2023-Valentines-Day/images/giftBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/giftBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/good_num.png
+++ b/view/peko/activity/2023-Valentines-Day/images/good_num.png
--- a/view/peko/activity/2023-Valentines-Day/images/gx.png
+++ b/view/peko/activity/2023-Valentines-Day/images/gx.png
--- a/view/peko/activity/2023-Valentines-Day/images/letter.png
+++ b/view/peko/activity/2023-Valentines-Day/images/letter.png
--- a/view/peko/activity/2023-Valentines-Day/images/letterBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/letterBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/letter_gift.png
+++ b/view/peko/activity/2023-Valentines-Day/images/letter_gift.png
--- a/view/peko/activity/2023-Valentines-Day/images/lianghao.png
+++ b/view/peko/activity/2023-Valentines-Day/images/lianghao.png
--- a/view/peko/activity/2023-Valentines-Day/images/line_l.png
+++ b/view/peko/activity/2023-Valentines-Day/images/line_l.png
--- a/view/peko/activity/2023-Valentines-Day/images/line_r.png
+++ b/view/peko/activity/2023-Valentines-Day/images/line_r.png
--- a/view/peko/activity/2023-Valentines-Day/images/logo.png
+++ b/view/peko/activity/2023-Valentines-Day/images/logo.png
--- a/view/peko/activity/2023-Valentines-Day/images/main.png
+++ b/view/peko/activity/2023-Valentines-Day/images/main.png
--- a/view/peko/activity/2023-Valentines-Day/images/mingpai.png
+++ b/view/peko/activity/2023-Valentines-Day/images/mingpai.png
--- a/view/peko/activity/2023-Valentines-Day/images/mycpBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/mycpBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/myrankBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/myrankBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/myxin.png
+++ b/view/peko/activity/2023-Valentines-Day/images/myxin.png
--- a/view/peko/activity/2023-Valentines-Day/images/openGiftBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/openGiftBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/petitionBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/petitionBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/petition_title.png
+++ b/view/peko/activity/2023-Valentines-Day/images/petition_title.png
--- a/view/peko/activity/2023-Valentines-Day/images/rankAward.png
+++ b/view/peko/activity/2023-Valentines-Day/images/rankAward.png
--- a/view/peko/activity/2023-Valentines-Day/images/rankBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/rankBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/rank_title.png
+++ b/view/peko/activity/2023-Valentines-Day/images/rank_title.png
--- a/view/peko/activity/2023-Valentines-Day/images/recordBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/recordBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/rule.png
+++ b/view/peko/activity/2023-Valentines-Day/images/rule.png
--- a/view/peko/activity/2023-Valentines-Day/images/ruleBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/ruleBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/slide1.png
+++ b/view/peko/activity/2023-Valentines-Day/images/slide1.png
--- a/view/peko/activity/2023-Valentines-Day/images/slide2.png
+++ b/view/peko/activity/2023-Valentines-Day/images/slide2.png
--- a/view/peko/activity/2023-Valentines-Day/images/special1.png
+++ b/view/peko/activity/2023-Valentines-Day/images/special1.png
--- a/view/peko/activity/2023-Valentines-Day/images/special2.png
+++ b/view/peko/activity/2023-Valentines-Day/images/special2.png
--- a/view/peko/activity/2023-Valentines-Day/images/special3.png
+++ b/view/peko/activity/2023-Valentines-Day/images/special3.png
--- a/view/peko/activity/2023-Valentines-Day/images/special4.png
+++ b/view/peko/activity/2023-Valentines-Day/images/special4.png
--- a/view/peko/activity/2023-Valentines-Day/images/swiper_title.png
+++ b/view/peko/activity/2023-Valentines-Day/images/swiper_title.png
--- a/view/peko/activity/2023-Valentines-Day/images/tishiBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/tishiBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/to_charge.png
+++ b/view/peko/activity/2023-Valentines-Day/images/to_charge.png
--- a/view/peko/activity/2023-Valentines-Day/images/toushi.png
+++ b/view/peko/activity/2023-Valentines-Day/images/toushi.png
--- a/view/peko/activity/2023-Valentines-Day/images/txBg.png
+++ b/view/peko/activity/2023-Valentines-Day/images/txBg.png
--- a/view/peko/activity/2023-Valentines-Day/images/unread.png
+++ b/view/peko/activity/2023-Valentines-Day/images/unread.png
--- a/view/peko/activity/2023-Valentines-Day/images/xin.png
+++ b/view/peko/activity/2023-Valentines-Day/images/xin.png
--- a/view/peko/activity/2023-Valentines-Day/images/ziliaoka.png
+++ b/view/peko/activity/2023-Valentines-Day/images/ziliaoka.png
--- a/view/peko/activity/2023-Valentines-Day/images/zuojia.png
+++ b/view/peko/activity/2023-Valentines-Day/images/zuojia.png
--- a/view/peko/activity/2023-Valentines-Day/index.html
+++ b/view/peko/activity/2023-Valentines-Day/index.html
@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+        content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <title>情定cp 缔结良缘</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?v=1.43">
+</head>
+
+<body>
+    <div class="wrap no-in-app">
+        <!-- 主视觉 -->
+        <div class="banner"><img src="./images/main.png" alt=""></div>
+        <div class="mycp"><img src="./images/btn_cp.png" alt=""></div>
+        <div class="unread">0</div>
+        <div class="rule"><img src="./images/btn_rule.png" alt=""></div>
+        <!-- 情缘信物 -->
+        <div class="letter-wrap">
+            <div class="tips">購買並贈送CP信物，對方同意締結後，即可結成CP；<br>送情人節限定禮物和信物都能增加情緣值喲~</div>
+            <div class="cp_record">CP獎勵記錄</div>
+            <div class="letter">
+                <div class="imgbox">
+                    <img src="./images/letter_gift.png" alt="">
+                </div>
+                <p>我的信物：<e>0</e>個</p>
+                <div class="letter_rule">締結CP後，互送情人節限定禮物，積攢<br>情緣值即可獲得豐厚特權獎勵~</div>
+            </div>
+            <div class="but">
+                <input type="number" value="1" maxlength="999"
+                    onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                <img src="./images/btn_add.png" class="add" alt="">
+                <img src="./images/btn_cut.png" class="cut" alt="">
+            </div>
+            <!-- 获取信物按钮 -->
+            <div class="get_letter">
+                <img src="./images/get_letter.png" alt="">
+            </div>
+            <!-- 特权奖励 -->
+            <div class="award_title">
+                <img class="line" src="./images/line_l.png" alt="">
+                <span>特權獎勵</span>
+                <img class="line" src="./images/line_r.png" alt="">
+            </div>
+            <div class="subheard">達到相應的情緣值即可獲得對應特權獎勵哦～</div>
+            <div class="award">
+                <div class="giftbox">
+                    <img src="./images/special1.png" alt="">
+                    <span>一見鐘情</span>
+                    <p>10000情緣值</p>
+                </div>
+                <img class="arrow" src="./images/arrows.png" alt="">
+                <div class="giftbox">
+                    <img src="./images/special2.png" alt="">
+                    <span>情竇初開</span>
+                    <p>52000情緣值</p>
+                </div>
+                <img class="arrow" src="./images/arrows.png" alt="">
+                <div class="giftbox">
+                    <img src="./images/special3.png" alt="">
+                    <span>心心相印</span>
+                    <p>131400情緣值</p>
+                </div>
+                <img class="arrow" src="./images/arrows.png" alt="">
+                <div class="giftbox">
+                    <img src="./images/special4.png" alt="">
+                    <span>緣定今生</span>
+                    <p>334400情緣值</p>
+                </div>
+            </div>
+        </div>
+        <img class="bling0" src="./images/bling0.png" alt="">
+        <!-- 礼物轮播 -->
+        <div class="swiper-title"></div>
+        <div class="swiper-container swiper">
+            <div class="swiper-wrapper">
+                <div class="swiper-slide">
+                    <img src="./images/slide1.png" alt="">
+                </div>
+                <div class="swiper-slide">
+                    <img src="./images/slide2.png" class="slide2" alt="">
+                </div>
+            </div>
+            <!-- <div class="swiper-pagination swp"></div> -->
+        </div>
+        <img class="bling1" src="./images/bling1.png" alt="">
+        <!-- 送礼得情签 -->
+        <div class="petition_title"></div>
+        <div class="petition-wrap">
+            <div class="myticket">
+                <span>我的情簽: <e></e></span>
+                <div class="charge">兌換記錄</div>
+            </div>
+            <div class="subheard">贈送情人節限定禮物，送出一個禮物可得對應數量的「幸運情簽」,且可增加CP間的情緣值，情簽可兌換特權或抽獎喲~</div>
+            <div class="chargeTab">
+                <div class="item itemact">兌換好禮</div>
+                <div class="item">幸運靚號</div>
+            </div>
+            <ul class="gift-wrap">
+                <li class="li1">
+                    <div class="giftbg">
+                        <img class="mingpai" src="./images/mingpai.png" alt="">
+                    </div>
+                    <span></span>
+                    <div class="but">
+                        <input type="number" value="1" onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                        <img src="./images/btn_add.png" class="add" alt="">
+                        <img src="./images/btn_cut.png" class="cut" alt="">
+                    </div>
+                    <div class="btn">兌換銘牌</div>
+                    <p><e></e>情签一次</p>
+                </li>
+                <li class="li2">
+                    <div class="giftbg">
+                        <img class="gift" src="./images/ziliaoka.png" alt="">
+                    </div>
+                    <span></span>
+                    <div class="but">
+                        <input type="number" value="1" onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                        <img src="./images/btn_add.png" class="add" alt="">
+                        <img src="./images/btn_cut.png" class="cut" alt="">
+                    </div>
+                    <div class="btn">兌換資料卡</div>
+                    <p><e></e>情签一次</p>
+                </li>
+                <li class="li3">
+                    <div class="giftbg">
+                        <img class="gift" src="./images/toushi.png" alt="">
+                    </div>
+                    <span></span>
+                    <div class="but">
+                        <input type="number" value="1" onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                        <img src="./images/btn_add.png" class="add" alt="">
+                        <img src="./images/btn_cut.png" class="cut" alt="">
+                    </div>
+                    <div class="btn">兌換頭飾</div>
+                    <p><e></e>情签一次</p>
+                </li>
+                <li class="li4">
+                    <div class="giftbg">
+                        <img class="gift" src="./images/zuojia.png" alt="">
+                    </div>
+                    <span></span>
+                    <div class="but">
+                        <input type="number" value="1" onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                        <img src="./images/btn_add.png" class="add" alt="">
+                        <img src="./images/btn_cut.png" class="cut" alt="">
+                    </div>
+                    <div class="btn">兌換座駕</div>
+                    <p><e></e>情签一次</p>
+                </li>
+            </ul>
+            <ul class="number-wrap" style="display: none;">
+                <li>
+                    <div class="giftbg">
+                        <img class="gift" src="./images/lianghao.png" alt="">
+                    </div>
+                    <span>幸運靚號(52***)1組</span>
+                    <div class="but">
+                        <input type="number" value="1" onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))">
+                        <img src="./images/btn_add.png" class="add" alt="">
+                        <img src="./images/btn_cut.png" class="cut" alt="">
+                    </div>
+                    <div class="btn">抽取靚號</div>
+                    <p><e></e>情签一次</p>
+                    <div class="tips">中獎後請聯系客服領取哦~</div>
+                </li>
+            </ul>
+        </div>
+        <img class="bling2" src="./images/bling2.png" alt="">
+        <!-- 榜单 -->
+        <div class="rank_title"></div>
+        <div class="rank-wrap">
+            <!-- 奖励 -->
+            <img src="./images/rankAward.png" class="reward" alt="">
+            <!-- 榜单列表 -->
+            <div class="list">
+                <div class="no1">
+                    <div class="txbox1">
+                        <img src="./images/logo.png" class="tx" alt="">
+                    </div>
+                    <div class="txbox2">
+                        <img src="./images/logo.png" class="tx" alt="">
+                    </div>
+                    <div class="nick1">虛位以待</div>
+                    <div class="nick2">虛位以待</div>
+                    <img src="./images/xin.png" class="xin" alt="">
+                    <div class="score">情緣值:<b>0</b></div>
+                </div>
+                <ul>
+                    <!-- <li>
+                        <div class="num">2</div>
+                        <div class="txbox1">
+                            <img src="./images/logo.png" class="tx" alt="">
+                        </div>
+                        <div class="txbox2">
+                            <img src="./images/logo.png" class="tx" alt="">
+                        </div>
+                        <div class="nick1"></div>
+                        <div class="nick2"></div>
+                        <img src="./images/xin.png" class="xin" alt="">
+                        <span>情緣值</span>
+                        <div class="score"></div>
+                    </li>
+                    <li><p>等你來上榜~</p></li> -->
+                </ul>
+            </div>
+            <div class="myRank">
+                <div class="num">未上榜</div>
+                <div class="txbox1">
+                    <img src="./images/logo.png" class="tx" alt="">
+                </div>
+                <div class="txbox2">
+                    <img src="./images/logo.png" class="tx" alt="">
+                </div>
+                <div class="nick1">暫無cp</div>
+                <div class="nick2">暫無cp</div>
+                <img src="./images/myxin.png" class="xin" alt="">
+                <span>情緣值</span>
+                <div class="score">0</div>
+            </div>
+        </div>
+
+    </div>
+
+    <!-- 恭喜获得弹窗1,2 -->
+    <div class="gx">
+        <div class="gx_in">
+            <img src="./images/close.png" class="close" alt="">
+            <ul class="box">
+                <li>
+                    <div class="bg">
+                        <img src="./images/logo.png" alt="">
+                    </div>
+                    <span></span>
+                </li>
+            </ul>
+            <img src="./images/btn_sure.png" class="sure" alt="">
+            <div class="tips">奖励将自动发放到装扮中心，快去展示自己吧~</div>
+            <!-- <div class="tips">*情人节限定5位靓号:52XXX（XXX为随机数字，一组为2个靓号，<br>联系客服领取：LINE: pekoyuyin)</div> -->
+        </div>
+    </div>
+    <!-- 我的cp弹窗 -->
+    <div class="mycpBox">
+        <div class="mycp_in">
+            <img src="./images/close.png" class="close" alt="">
+            <div class="tishi">*CP一旦結成，不可取消</div>
+            <p>
+                <span>我的CP</span>
+                <span>情缘值</span>
+                <span>状态</span>
+            </p>
+            <ul class="box">
+                <li>
+                    <b>CP1的昵称...</b>
+                    <b class="cpValue">170011703</b>
+                    <span class="pass">已缔结</span>
+                </li>
+                <li>
+                    <b>CP1的昵称...</b>
+                     <b class="cpValue">170011703</b>
+                    <span class="waitpass" inviterUid="2346">可通过</span>
+                </li>
+                <li>
+                    <b>Cp1的昵称...</b>
+                     <b class="cpValue">170011703</b>
+                    <span class="canpass">待通过</span>
+                </li>
+            </ul>
+            <div class="tips">暫無更多記錄~</div>
+        </div>
+    </div>
+    <!-- cp奖励记录弹窗 -->
+    <div class="cpRecordBox">
+        <div class="cpRecord_in">
+            <img src="./images/close.png" class="close" alt="">
+            <p>
+                <span>时间</span>
+                <span>我的CP</span>
+                <span>情缘等级</span>
+                <span>奖励</span>
+            </p>
+            <ul class="box">
+                <li>
+                    <b>08.31 <e>23:23</e></b>
+                    <b>CP1的昵称...</b>
+                    <b>缘定今生</b>
+                    <b class="jiangli">XXX座驾1天*1组</b>
+                </li>
+            </ul>
+            <div class="tips">暫無更多記錄~</div>
+        </div>
+    </div>
+    <!-- 情签抽奖记录弹窗 -->
+    <div class="drawBox">
+        <div class="draw_in">
+            <img src="./images/close.png" class="close" alt="">
+            <p>
+                <span>时间</span>
+                <span>消耗情签</span>
+                <span>奖励</span>
+            </p>
+            <ul class="box">
+                <li>
+                    <b>08.31 <e>23:23</e></b>
+                    <b>38</b>
+                    <b class="number">幸运靓号1组</b>
+                </li>
+                <li>
+                    <b>08.31 <e>23:23</e></b>
+                    <b>38</b>
+                    <b class="number">未中奖</b>
+                </li>
+            </ul>
+            <div class="tips">暫無更多記錄~</div>
+        </div>
+    </div>
+    <!-- 情签兑换记录弹窗 -->
+    <div class="exchangeBox">
+        <div class="exchange_in">
+            <img src="./images/close.png" class="close" alt="">
+            <p>
+                <span>时间</span>
+                <span>消耗情签</span>
+                <span>奖励</span>
+                <span>奖励天数</span>
+            </p>
+            <ul class="box">
+                <li>
+                    <b>08.31 <e>23:23</e></b>
+                    <b>28</b>
+                    <b>缘定今生</b>
+                    <b>1天</b>
+                </li>
+
+            </ul>
+            <div class="tips">暫無更多記錄~</div>
+        </div>
+    </div>
+    <!-- 规则弹窗 -->
+    <div class="ruleBox">
+        <div class="rule_in">
+            <img src="./images/close.png" class="close" alt="">
+            <div class="box">
+                <img src="./images/rule.png" alt="">
+            </div>
+        </div>
+    </div>
+    <!-- 榜單獎勵 -->
+    <div class="rewardBox">
+        <div class="reward_in">
+            <img src="./images/close.png" class="close" alt="">
+            <div class="box">
+                <img src="./images/cpAward.png" alt="">
+            </div>
+        </div>
+    </div>
+    <!-- 温馨提示 -->
+    <div class="tishiBox">
+        <div class="tishi_in">
+            <div class="title">鉆石不足，請充值後再來獲取信物吧~</div>
+            <img src="./images/to_charge.png" class="recharge" alt="">
+            <img src="./images/close.png" class="close" alt="">
+        </div>
+    </div>
+
+
+    <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="./js/swiper-bundle.min.js"></script>
+    <script src="./js/index.js?v=1.43"></script>
+</body>
+
+</html>
--- a/view/peko/activity/2023-Valentines-Day/js/index.js
+++ b/view/peko/activity/2023-Valentines-Day/js/index.js
@@ -0,0 +1,876 @@
+
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+if (env == 'test') {
+    new VConsole();
+}
+
+
+// 封裝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',
+        offset: 'b'
+    })
+}
+
+if (false) {//!browser.app
+    toastMsg('請在app內打開！');
+} else {
+    $('.wrap').removeClass('no-in-app')
+}
+
+var nowTime = new Date().getTime()
+var startTime
+var endTime
+var canGet = true
+
+$(function () {
+    getInfoFromClient()
+    setTimeout(function () {
+        getLetterInit()
+        getPetitionInit()
+        cpOffset()
+        getRank()
+        swiperFun()
+    }, 100)
+})
+
+// 礼物轮播
+function swiperFun() {
+    var swiper = new Swiper('.swiper', {
+        autoplay: {
+            delay: 2000,//2秒切换一次
+        },
+        // loop: true, // 循环模式选项
+        direction: 'horizontal',
+    });
+}
+
+// 获取信物配置
+function getLetterInit() {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/getKeepsakeConfig',
+        success(res) {
+            if (res.code === 200) {
+                startTime = res.data.startTime;
+                endTime = res.data.endTime;
+                $('.letter-wrap .letter .imgbox img').attr('src', res.data.keepsake.icon)
+                $('.letter-wrap .letter p e').text(res.data.keepsakeNum)
+                $('.letter-wrap .get_letter').attr('id', res.data.keepsake.id)
+                $('.letter-wrap .get_letter').attr('type', res.data.keepsake.type)
+                if (nowTime >= res.data.endTime) {
+                    $('.letter-wrap .get_letter').css('filter', 'grayscale(0.7)')
+                }
+                hideLoading(layerIndex)
+            } else {
+                toastMsg(res.message)
+                hideLoading(layerIndex)
+            }
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 获取兑换/抽奖配置
+function getPetitionInit() {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/getPropItemConfig',
+        success(res) {
+            if (res.code === 200) {
+                $('.petition-wrap .myticket span e').html(res.data.cpCurrency)
+                let numberList = res.data.propTabs.find(item => {
+                    return item.type == 2
+                })
+                let chargeList = res.data.propTabs.find(item => {
+                    return item.type == 1
+                })
+                chargeList.props.forEach((res, i) => {
+                    $(`.petition-wrap .gift-wrap .li${i + 1} .giftbg img`).attr('src', res.icon)
+                    $(`.petition-wrap .gift-wrap .li${i + 1} span`).html(res.name)
+                    $(`.petition-wrap .gift-wrap .li${i + 1} .btn`).attr('id', res.id)
+                    $(`.petition-wrap .gift-wrap .li${i + 1} .btn`).attr('type', res.type)
+                    $(`.petition-wrap .gift-wrap .li${i + 1} .btn`).html(res.type == 2 ? '兌換銘牌' : res.type == 3 ? '兌換資料卡' : res.type == 4 ? '兌換頭飾' : '兌換座駕')
+                    $(`.petition-wrap .gift-wrap .li${i + 1} p e`).html(res.price)
+                })
+
+                numberList.props.forEach(res => {
+                    $('.petition-wrap .number-wrap .giftbg img').attr('src', res.icon)
+                    $('.petition-wrap .number-wrap span').html(res.name)
+                    $('.petition-wrap .number-wrap .btn').attr('id', res.id)
+                    $('.petition-wrap .number-wrap .btn').attr('type', res.type)
+                    $('.petition-wrap .number-wrap p e').html(res.price)
+
+                })
+
+
+                hideLoading(layerIndex)
+            } else {
+                toastMsg(res.message)
+                hideLoading(layerIndex)
+            }
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 我的cp未读数 
+function cpOffset() {
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/cpOffset',
+        success(res) {
+            if (res.code === 200) {
+                if (res.data > 9) {
+                    $('.wrap .unread').html('9+')
+                } else if (res.data == 0) {
+                    $('.wrap .unread').hide()
+                } else {
+                    $('.wrap .unread').html(res.data)
+                }
+            } else {
+                toastMsg(res.message)
+            }
+        },
+        error(err) {
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 我的cp列表
+function myCpList() {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/cpList',
+        success(res) {
+            if (res.code === 200) {
+                let cpList = ''
+                if (res.data == 0 || !res.data) {
+                    $('.mycpBox .mycp_in .tips').show()
+                } else {
+                    res.data.forEach(res => {
+                        cpList += `
+                        <li>
+                            <b>${res.nick.length > 5 ? res.nick.slice(0, 5) + '...' : res.nick}</b>
+                            <b class="cpValue">${res.cpValue}</b>
+                            <span inviterUid="${res.uid}" class='${res.status == 0 ? "canpass" : res.status == 1 ? "waitpass" : "pass"}'>${res.status == 0 ? "待通過" : res.status == 1 ? "可通過" : "已締結"}</span>
+                        </li>
+                        `
+                    })
+                    $('.mycpBox .mycp_in ul').append(cpList)
+                }
+                $('.mycpBox').show();
+
+                $('.mycpBox .mycp_in .box li').off()
+                $('.mycpBox .mycp_in .box li').on("click", '.waitpass', function () {
+                    let index = $(this).parents().index()
+                    let inviterUid = $(this).attr('inviterUid')
+                    confirmCp(inviterUid, index)
+                })
+
+
+                hideLoading(layerIndex)
+            } else {
+                toastMsg(res.message)
+                hideLoading(layerIndex)
+            }
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 通过cp缔结
+function confirmCp(inviterUid, index) {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/confirmCp',
+        data: { inviterUid },
+        success(res) {
+            if (res.code === 200) {
+                $('.mycpBox .mycp_in .box li').eq(index).find('span').addClass('pass')
+                $('.mycpBox .mycp_in .box li').eq(index).find('span').removeClass('waitpass')
+                $('.mycpBox .mycp_in .box li').eq(index).find('span').html('已締結')
+                toastMsg('締結成功，快去增加和TA的情緣值吧~')
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            toastMsg('網絡錯誤，請退出重進')
+            hideLoading(layerIndex)
+        }
+    })
+}
+
+// cp奖励记录
+var cpRecordPage = 1
+var cpRecordScroll = true
+function cpRewardRecord(cpRecordPage) {
+    cpRecordScroll = false;
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/pageCpRewardRecord',
+        data: { page: cpRecordPage, pageSize: 10 },
+        success(res) {
+            if (res.code === 200) {
+                if (res.data.records.length > 0) {
+                    let str = ``;
+                    res.data.records.forEach((res, i) => {
+                        str += `
+                        <li>
+                            <b>${res.dateTime}</b>
+                            <b>${res.nick.length > 5 ? res.nick.slice(0, 5) + '...' : res.nick}</b>
+                            <b>${res.levelDesc}</b>
+                            <b class="jiangli">${res.rewardDesc}</b>
+                        </li>
+                        `
+                    });
+                    $('.cpRecordBox .cpRecord_in .box').append(str);
+                    cpRecordScroll = true;
+                } else {
+                    cpRecordScroll = false;
+                    $('.cpRecordBox .cpRecord_in .tips').show();
+                }
+                $('.cpRecordBox').show();
+
+                hideLoading(layerIndex)
+            } else {
+                cpRecordScroll = true;
+                bodyScroolFun(false)
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error(err) {
+            cpRecordScroll = true;
+            bodyScroolFun(false)
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 获取兑换/抽奖记录
+var drawPage = 1
+var drawScroll = true
+function getDrawRecord(drawPage, tab) {
+    drawScroll = false;
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/pageRecord',
+        data: { page: drawPage, pageSize: 10, tab },
+        success(res) {
+            if (res.code === 200) {
+                if (res.data.records.length > 0) {
+                    let str = ``;
+                    if (tab == 1) {
+                        res.data.records.forEach((res, i) => {
+                            str += `
+                            <li>
+                                <b>${res.dateTime}</b>
+                                <b>${res.cost}</b>
+                                <b>${res.rewardDesc}</b>
+                                <b>${res.rewardDays}天</b>
+                            </li>
+                            `
+                        });
+                        $('.exchangeBox .exchange_in .box').append(str);
+                        $('.exchangeBox').show();
+                    } else {
+                        res.data.records.forEach((res, i) => {
+                            str += `
+                            <li>
+                                <b>${res.dateTime}</b>
+                                <b>${res.cost}</b>
+                                <b>${res.rewardDesc}</b>
+                            </li>
+                            `
+                        });
+                        $('.drawBox .draw_in .box').append(str);
+                        $('.drawBox').show();
+                    }
+
+                    drawScroll = true;
+                } else {
+                    drawScroll = false;
+                    if (tab == 1) {
+                        $('.exchangeBox .exchange_in .tips').show();
+                        $('.exchangeBox').show();
+                    } else {
+                        $('.drawBox .draw_in .tips').show();
+                        $('.drawBox').show();
+                    }
+                }
+                hideLoading(layerIndex)
+            } else {
+                drawScroll = true;
+                bodyScroolFun(false)
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error(err) {
+            drawScroll = true;
+            bodyScroolFun(false)
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 购买信物、兑换、抽奖 (道具id,数量)
+function buy(id, num, type) {
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/act/valentineCp/buy',
+        data: { id, num },
+        success(res) {
+            if (res.code === 200) {
+                if (res.data.prop) {
+                    if (res.data.prop.type == 1) {
+                        $('.letter-wrap .letter p e').html(res.data.remain)
+                        toastMsg('購買成功，信物已放進背包，快送給你心儀的TA吧~')
+                        canGet = true
+                    } else if (res.data.prop.type == 6) {
+                        $('.petition-wrap .myticket span e').html(res.data.remain)
+                        $('.gx .gx_in .box li img').attr('src', res.data.prop.icon)
+                        $('.gx .gx_in .box li span').html( res.data.prop.name)
+                        $('.gx .gx_in .tips').html(`*情人節限定5位靚號:52XXX（XXX為隨機數字，一組為2個靚號，<br>聯系客服領取：LINE: pekoyuyin)`)
+                        $('.gx').show()
+
+                    } else {
+                        // if (res.data.prop.type == 2){
+                        //     $('.gx .gx_in .box li img').addClass('mingpai')
+                        // }else {
+                        //     $('.gx .gx_in .box li img').removeClass('mingpai')
+                        // }
+                        $('.petition-wrap .myticket span e').html(res.data.remain)
+                        $('.gx .gx_in .box li img').attr('src', res.data.prop.icon)
+                        $('.gx .gx_in .box li span').html(res.data.prop.name)
+                        $('.gx .gx_in .tips').html(`獎勵將自動發放到裝扮中心，快去展示自己吧~`)
+                        $('.gx').show()
+                    }
+                } else {
+                    if (type == 6) {
+                        toastMsg('很遺憾沒有抽到，距離靚號就差一點啦~')
+                        $('.petition-wrap .myticket span e').html(res.data.remain)
+                    } else if(type == 1,type == 3,type == 4,type == 5){
+                        $('.petition-wrap .myticket span e').html(res.data.remain)
+                    }else{
+                        $('.letter-wrap .letter p e').html(res.data.remain)
+                        toastMsg(res.message)
+                    }
+
+                    canGet = true
+                }
+
+                hideLoading(layerIndex)
+            } else if (res.code == 31005) {
+                $('.tishiBox').show()
+                canGet = true
+                hideLoading(layerIndex)
+            } else {
+                toastMsg(res.message)
+                canGet = true
+                hideLoading(layerIndex)
+            }
+        },
+        error(err) {
+            canGet = true
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 榜单接口
+function getRank() {
+    $('.rank-wrap .list ul li').remove();
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/act/valentineCp/getRank',
+        success(res) {
+            if (res.code === 200) {
+                // 前一
+                var top1 = res.data.rankList.slice(0, 1);
+                var notTop1 = res.data.rankList.slice(1);
+                if (top1.length < 1) {
+                    let arr = new Array(1 - top1.length).fill({
+                        inviterAvatar: './images/logo.png',
+                        inviterNick: '虛位以待',
+                        cpValue: 0,
+                        inviteeAvatar: './images/logo.png',
+                        inviteeNick: '虛位以待',
+                    })
+                    top1.push(...arr)
+                }
+                top1.forEach((res, index) => {
+                    $(`.rank-wrap .list .no${index + 1} .txbox1 img`).attr('src', res.inviterAvatar);
+                    $(`.rank-wrap .list .no${index + 1} .txbox1`).attr('uid', res.inviterUid);
+                    $(`.rank-wrap .list .no${index + 1} .nick1`).html(res.inviterNick.length > 5 ? res.inviterNick.slice(0, 5) + '...' : res.inviterNick);
+                    $(`.rank-wrap .list .no${index + 1} .txbox2 img`).attr('src', res.inviteeAvatar);
+                    $(`.rank-wrap .list .no${index + 1} .txbox2`).attr('uid', res.inviteeUid);
+                    $(`.rank-wrap .list .no${index + 1} .nick2`).html(res.inviteeNick.length > 5 ? res.inviteeNick.slice(0, 5) + '...' : res.inviteeNick);
+                    $(`.rank-wrap .list .no${index + 1} .score b`).html(`${res.cpValue > 10000 ? (Math.floor(res.cpValue / 1000) / 10).toFixed(1) + 'w' : res.cpValue}`);
+                });
+                // 非前
+                let str = ``;
+                notTop1.forEach((res, i) => {
+                    str += `
+                    <li>
+                        <div class="num">${res.ranking}</div>
+                        <div class="txbox1" uid="${res.inviterUid}">
+                            <img src="${res.inviterAvatar}" uid="${res.inviterUid}" class="tx" alt="">
+                        </div>
+                        <div class="txbox2" uid="${res.inviteeUid}">
+                            <img src="${res.inviteeAvatar}" uid="${res.inviteeUid}" class="tx" alt="">
+                        </div>
+                        <div class="nick1">${res.inviterNick.length > 5 ? res.inviterNick.slice(0, 5) + '...' : res.inviterNick}</div>
+                        <div class="nick2">${res.inviteeNick.length > 5 ? res.inviteeNick.slice(0, 5) + '...' : res.inviteeNick}</div>
+                        <img src="./images/xin.png" class="xin" alt="">
+                        <span>情緣值</span>
+                        <div class="score">${res.cpValue > 10000 ? (Math.floor(res.cpValue / 1000) / 10).toFixed(1) + 'w' : res.cpValue}</div>
+                    </li>
+                    `
+                })
+                $('.rank-wrap .list ul').append(str);
+
+                if (notTop1.length < 9) {
+                    $('.rank-wrap .list ul li').eq(notTop1.length - 1).after(`<li><p>等你來上榜~</p></li>`)
+                }
+                if (notTop1.length == 0) {
+                    $('.rank-wrap .list ul').append(`<li><p>等你來上榜~</p></li>`)
+                }
+
+                $('.rank-wrap .list ul li').on('click', '.txbox1,.txbox2', function () {
+                    console.log(123456);
+                    let uid = $(this).attr('uid')
+                    console.log(uid);
+                    if (uid) {
+                        openPerson(uid)
+                    }
+                })
+
+                // 自己排名
+                if (res.data.meRank) {
+                    if (res.data.meRank.ranking == 0) {
+                        $('.rank-wrap .myRank .num').removeClass('norank')
+                    } else {
+                        $('.rank-wrap .myRank .num').addClass('norank')
+                    }
+                    $('.rank-wrap .myRank .num').html(res.data.meRank.ranking == 0 ? '未上榜' : res.data.meRank.ranking);
+                    $('.rank-wrap .myRank .txbox1 img').attr('src', res.data.meRank.inviterAvatar);
+                    $('.rank-wrap .myRank .txbox2 img').attr('src', res.data.meRank.inviteeAvatar);
+                    $('.rank-wrap .myRank .nick1').text(res.data.meRank.inviterNick.length > 5 ? res.data.meRank.inviterNick.slice(0, 5) + '...' : res.data.meRank.inviterNick)
+                    if(res.data.meRank.inviteeNick){
+                        $('.rank-wrap .myRank .nick2').text(res.data.meRank.inviteeNick.length > 5 ? res.data.meRank.inviteeNick.slice(0, 5) + '...' : res.data.meRank.inviteeNick)
+                    }
+                    $('.rank-wrap .myRank .score').html(`${res.data.meRank.cpValue > 10000 ? (Math.floor(res.data.meRank.cpValue / 1000) / 10).toFixed(1) + 'w' : res.data.meRank.cpValue}`);
+                }
+                hideLoading(layerIndex)
+
+            } else {
+                toastMsg(res.message)
+                hideLoading(layerIndex)
+            }
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 埋点接口
+//  event（去充值=pay_show, 活动规则=rule_click, 排行榜奖励=list_click, 跳转个人主页=pages_click）
+function sendLog(event) {
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/act/valentineCp/log',
+        data: { event: event },
+        success(res) {
+            if (res.code === 200) {
+                // console.log(res);
+            }
+        },
+        error(err) {
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+
+// 点击跳转个人主页
+$('.rank-wrap .list .no1 .tx').click(function () {
+    let uid = $(this).parent().attr('uid')
+    if (uid) {
+        openPerson(uid)
+    }
+})
+
+
+// 情缘信物投入+
+$('.letter-wrap .but .add').click(function () {
+    let val = $('.letter-wrap .but input').val();
+    if (val >= 999) {
+        toastMsg('最多可輸入999')
+        $('.letter-wrap .but input').val(parseInt(999))
+    } else {
+        $('.letter-wrap .but input').val(parseInt(val) + 1)
+    }
+})
+// 情缘信物投入-
+$('.letter-wrap .but .cut').click(function () {
+    let val = $('.letter-wrap .but input').val();
+    if (val <= 1) {
+        toastMsg('至少投入1')
+        $('.letter-wrap .but input').val(parseInt(1))
+    } else {
+        $('.letter-wrap .but input').val(parseInt(val) - 1)
+    }
+})
+// 情缘信物监听输入框
+$('.letter-wrap .but').on('input', 'input', function () {
+    if ($(this).val() >= 999) {
+        toastMsg('最多可輸入999')
+        $('.letter-wrap .but input').val(parseInt(999))
+    } else if ($(this).val() <= 1) {
+        toastMsg('至少投入1')
+        $('.letter-wrap .but input').val(parseInt(1))
+    }
+})
+// 购买情缘信物按钮
+$('.letter-wrap .get_letter').click(function () {
+    if (nowTime >= endTime) {
+        toastMsg('活動已結束~')
+    } else if (nowTime <= startTime) {
+        toastMsg('活動未開始~')
+    } else {
+        let id = $(this).attr('id')
+        let type = $(this).attr('type')
+        let num = $('.letter-wrap .but input').val()
+        if (num == 0) {
+            toastMsg('至少投入1')
+            return
+        }
+        if (canGet) {
+            console.log('id:', id, 'num:', num);
+            buy(id, num, type)
+        } else {
+            toastMsg('信物獲取中，請稍後~')
+        }
+
+    }
+})
+
+
+// 兑换好礼按钮输入框
+// 投入+
+$('.petition-wrap .gift-wrap li .but .add').click(function () {
+    let liIndex = $(this).parents('li').index()
+    let val = $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val();
+    if (val >= 999) {
+        toastMsg('最多可輸入999')
+        $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val(parseInt(999))
+    } else {
+        $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val(parseInt(val) + 1)
+    }
+})
+// 投入-
+$('.petition-wrap .gift-wrap li .but .cut').click(function () {
+    let liIndex = $(this).parents('li').index()
+    let val = $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val();
+    if (val <= 1) {
+        toastMsg('至少投入1')
+        $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val(parseInt(1))
+    } else {
+        $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val(parseInt(val) - 1)
+    }
+})
+// 监听输入框
+$('.petition-wrap .gift-wrap li').on('input', 'input', function () {
+    let liIndex = $(this).parents('li').index()
+    let val = $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val();
+    if (val >= 999) {
+        toastMsg('最多可輸入999')
+        $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val(parseInt(999))
+    } else if (val <= 1) {
+        toastMsg('至少投入1')
+        $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val(parseInt(1))
+    }
+})
+// 兑换按钮
+$('.petition-wrap .gift-wrap li .btn').click(function () {
+    let liIndex = $(this).parents('li').index()
+    let num = $('.petition-wrap .gift-wrap li').eq(liIndex).find('.but input').val();
+    let id = $('.petition-wrap .gift-wrap li').eq(liIndex).find('.btn').attr('id');
+    let type = $('.petition-wrap .gift-wrap li').eq(liIndex).find('.btn').attr('type');
+    buy(id, num, type)
+})
+// 靓号按钮输入框
+// 投入+
+$('.petition-wrap .number-wrap .but .add').click(function () {
+    let val = $('.petition-wrap .number-wrap .but input').val();
+    if (val >= 999) {
+        toastMsg('最多可輸入999')
+        $('.petition-wrap .number-wrap .but input').val(parseInt(999))
+    } else {
+        $('.petition-wrap .number-wrap .but input').val(parseInt(val) + 1)
+    }
+})
+// 投入-
+$('.petition-wrap .number-wrap .but .cut').click(function () {
+    let val = $('.petition-wrap .number-wrap .but input').val();
+    if (val <= 1) {
+        toastMsg('至少投入1')
+        $('.petition-wrap .number-wrap .but input').val(parseInt(1))
+    } else {
+        $('.petition-wrap .number-wrap .but input').val(parseInt(val) - 1)
+    }
+})
+// 监听输入框
+$('.petition-wrap .number-wrap .but').on('input', 'input', function () {
+    if ($(this).val() >= 999) {
+        toastMsg('最多可輸入999')
+        $('.petition-wrap .number-wrap .but input').val(parseInt(999))
+    } else if ($(this).val() <= 1) {
+        toastMsg('至少投入1')
+        $('.petition-wrap .number-wrap .but input').val(parseInt(1))
+    }
+})
+// 抽取靓号
+$('.petition-wrap .number-wrap .btn').click(function () {
+    let id = $(this).attr('id');
+    let type = $(this).attr('type');
+    let num = $('.petition-wrap .number-wrap .but input').val();
+    buy(id, num, type)
+})
+
+// 关闭恭喜获得弹窗
+$('.gx .gx_in .sure,.close').click(function () {
+    $('.gx').hide()
+})
+// 我的cp弹窗
+$('.mycp').click(function () {
+    bodyScroolFun(true)
+    $('.mycpBox .mycp_in ul li').remove()
+    $('.mycpBox .mycp_in .box .tips').hide()
+    myCpList()
+})
+$('.mycpBox .close').click(function () {
+    bodyScroolFun(false)
+    cpOffset()
+    $('.mycpBox').hide();
+})
+// 监听我的cp滚动
+$('.mycpBox .mycp_in .box').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.mycpBox .mycp_in .box')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        $('.mycpBox .mycp_in .tips').show()
+    }
+})
+
+// cp奖励记录弹窗
+$('.letter-wrap .cp_record').click(function () {
+    bodyScroolFun(true)
+    cpRecordPage = 1;
+    totalList = 0
+    $('.cpRecordBox .cpRecord_in .box li').remove();
+    $('.cpRecordBox .cpRecord_in .tips').hide();
+    cpRewardRecord(cpRecordPage)
+})
+$('.cpRecordBox .close').click(function () {
+    bodyScroolFun(false)
+    $('.cpRecordBox').hide();
+})
+// cp奖励记录监听滚动
+$('.cpRecordBox .cpRecord_in .box').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.cpRecordBox .cpRecord_in .box')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        if (cpRecordScroll) {
+            cpRecordPage++;
+            cpRewardRecord(cpRecordPage)
+        }
+    }
+})
+
+// 兑换好礼/靓号切换
+var petitionType = 1 //1:兌換好禮 2:幸運靚號
+$('.petition-wrap .chargeTab .item').click(function () {
+    let index = $(this).index();
+    $(this).addClass('itemact').siblings().removeClass('itemact')
+    if (index == 0) {
+        $('.petition-wrap .gift-wrap').show()
+        $('.petition-wrap .number-wrap').hide()
+        $('.petition-wrap .myticket .charge').html('兌換記錄')
+        petitionType = 1
+
+    } else {
+        $('.petition-wrap .gift-wrap').hide()
+        $('.petition-wrap .number-wrap').show()
+        $('.petition-wrap .myticket .charge').html('抽獎記錄')
+        petitionType = 2
+    }
+})
+// 兑换好礼记录/抽奖记录弹窗
+$('.petition-wrap .charge').click(function () {
+    bodyScroolFun(true)
+    drawPage = 1;
+    if (petitionType == 1) {
+        $('.exchangeBox .exchange_in .box li').remove();
+        $('.exchangeBox .exchange_in .tips').hide();
+        // $('.exchangeBox').show();
+    } else {
+        $('.drawBox .draw_in .box li').remove();
+        $('.drawBox .draw_in .tips').hide();
+        // $('.drawBox').show();
+    }
+    getDrawRecord(drawPage, petitionType)
+
+})
+$('.drawBox .close').click(function () {
+    bodyScroolFun(false)
+    $('.drawBox').hide();
+})
+$('.exchangeBox .close').click(function () {
+    bodyScroolFun(false)
+    $('.exchangeBox').hide();
+})
+// 情签兑换记录监听滚动
+$('.exchangeBox .exchange_in .box').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.exchangeBox .exchange_in .box')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        if (drawScroll) {
+            drawPage++;
+            getDrawRecord(drawPage, petitionType)
+        }
+    }
+})
+// 抽奖记录监听滚动
+$('.drawBox .draw_in .box').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.drawBox .draw_in .box')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        if (drawScroll) {
+            drawPage++;
+            getDrawRecord(drawPage, petitionType)
+        }
+    }
+})
+// 规则弹窗
+$('.rule').click(function () {
+    bodyScroolFun(true)
+    $('.ruleBox').show();
+    sendLog('rule_click')
+})
+$('.ruleBox .close').click(function () {
+    bodyScroolFun(false)
+    $('.ruleBox').hide();
+})
+// 榜單獎勵
+$('.rank-wrap .reward').click(function () {
+    bodyScroolFun(true)
+    $('.rewardBox').show();
+    sendLog('list_click')
+})
+$('.rewardBox .close').click(function () {
+    bodyScroolFun(false)
+    $('.rewardBox').hide();
+})
+
+// 溫馨提示
+$('.tishiBox .close').click(function () {
+    bodyScroolFun(false)
+    $('.tishiBox').hide();
+})
+
+// 去充值(pay_show=点击去充值埋点)
+$('.tishiBox').on('click', '.recharge', function () {
+    if (browser.app) {
+        if (browser.android) {
+            let channel = pubInfo.deviceInfo.channel;
+            console.log(pubInfo.deviceInfo);
+            if (channel == "google") {
+                sendLog('pay_show')
+                window.androidJsObj.openChargePage(0);
+            } else {
+                sendLog('pay_show')
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            }
+        } else if (browser.ios) {
+            sendLog('pay_show')
+            window.webkit.messageHandlers.openChargePage.postMessage(null)
+        }
+    } else {
+        toastMsg('請在app內打開')
+    }
+})
+
+//跳转个人主页 （pages_click=跳转主页埋点）
+function openPerson(uid) {
+    if (browser.app) {
+        if (browser.ios) {
+            sendLog('pages_click')
+            window.webkit.messageHandlers.openPersonPage.postMessage(uid);
+        } else if (browser.android) {
+            if (androidJsObj && typeof androidJsObj === 'object') {
+                sendLog('pages_click')
+                window.androidJsObj.openPersonPage(uid);
+            }
+        }
+    } else {
+        toastMsg('請在app內打開')
+    }
+}
+
+// 控制body是否可以滑动
+function bodyScroolFun(bool) {
+    if (bool) {
+        $('body').css('overflow', 'hidden');
+    } else {
+        $('body').css('overflow', 'auto');
+
+    }
+}
--- a/view/peko/activity/2023-Valentines-Day/js/swiper-bundle.min.js
+++ b/view/peko/activity/2023-Valentines-Day/js/swiper-bundle.min.js
--- a/view/peko/activity/act-ocean/css/index.css
+++ b/view/peko/activity/act-ocean/css/index.css
@@ -11,7 +11,7 @@
 html,
 body {
  font-family: "din-medium";
-  background: #C8864C;
+  background: #531800;
  overflow-x: hidden;
 }

@@ -22,6 +22,14 @@ body {
 }
 .wrap .banner {
  width: 100%;
+  position: relative;
+}
+.wrap .banner .subtitle {
+  position: absolute;
+  top: 0.12rem;
+  right: 1.12rem;
+  width: 1.8666666667rem;
+  height: 1.12rem;
 }
 .wrap .rule,
 .wrap .record {
@@ -39,46 +47,79 @@ body {
 .wrap .record {
  top: 2.8533333333rem;
 }
-.wrap .previous-result {
+.wrap .previous_Round_Result {
+  width: 9.4266666667rem;
+  height: 1.52rem;
  position: absolute;
-  top: 14.9333333333rem;
+  top: 16.1rem;
  left: 50%;
  transform: translateX(-50%);
-  width: 9.4666666667rem;
-  height: 0.9066666667rem;
-  font-family: "pingfang-bold";
-  font-size: 0.4rem;
-  font-weight: bold;
-  color: white;
-  display: flex;
-  align-items: center;
-  background: url("../images/previous-result-bg.png") no-repeat 0 0/100% 100%;
+  background: url(../images/previous_Round_Result.png) no-repeat;
+  background-size: 100% 100%;
  z-index: 9;
 }
-.wrap .previous-result span {
+.wrap .previous_Round_Result span {
+  color: #fff;
+  position: absolute;
  font-weight: bold;
  margin-left: 0.36rem;
  text-shadow: 1px 1px 0px #fc8321, -1px -1px 0px #fc8321, 1px 1px 0px #fc8321, -1px -1px 0px #fc8321, 1px 1px 0px #fc8321, -1px -1px 0px #fc8321;
+  font-size: 0.48rem;
+  left: 0rem;
+  bottom: 1.65rem;
+  background: url(../images/wljg.png) no-repeat;
+  background-size: 100% 100%;
+  width: 1.7066666667rem;
+  height: 0.5066666667rem;
+  position: absolute;
 }
-.wrap .previous-result .result-list {
+.wrap .previous_Round_Result .box {
+  width: 9.4266666667rem;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  box-sizing: border-box;
+  padding: 0.2533333333rem 0.1333333333rem 0 0.1333333333rem;
+  overflow-x: scroll;
+}
+.wrap .previous_Round_Result .box::-webkit-scrollbar {
+  height: 2px;
+  display: none;
+}
+.wrap .previous_Round_Result .box ul {
+  width: 35rem;
+  height: 100%;
+}
+.wrap .previous_Round_Result .box ul li {
+  float: left;
+  width: 1.6266666667rem;
+  height: 0.9733333333rem;
+  background: url(../images/previous_Round_Result_Li.png) no-repeat;
+  background-size: 100% 100%;
  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  align-items: center;
+  margin-right: 0.1066666667rem;
 }
-.wrap .previous-result .result-list p {
-  width: 0.5333333333rem;
-  height: 0.5333333333rem;
-  margin-left: 0.1066666667rem;
-  background: url("../images/little-bubble.png") 0 0/100% 100%;
+.wrap .previous_Round_Result .box ul li p {
+  display: block;
+  width: 0.3333333333rem;
+  height: 0.3333333333rem;
+  background: url(../images/record_bubble.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  margin: 0 0.0266666667rem;
 }
-.wrap .previous-result .result-list p img {
-  width: 100%;
-}
-.wrap .previous-result .more-result {
-  width: 0.56rem;
-  height: 0.5866666667rem;
-  margin-left: 0.2rem;
-}
-.wrap .previous-result .more-result img {
-  width: 100%;
+.wrap .previous_Round_Result .box ul li p img {
+  display: block;
+  width: 80%;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
 }
 .wrap .mall {
  position: absolute;
@@ -99,6 +140,13 @@ body {
  height: 14.0533333333rem;
  background: url("../images/game-area.png") no-repeat 0 0/100% 100%;
 }
+.wrap .game-area .roundId {
+  font-size: 0.2666666667rem;
+  color: #701800;
+  position: absolute;
+  top: 0.16rem;
+  left: 0.4666666667rem;
+}
 .wrap .game-area .select-time {
  display: none;
 }
@@ -109,7 +157,7 @@ body {
  top: -0.5333333333rem;
  left: 50%;
  transform: translateX(-50%);
-  width: 4.2933333333rem;
+  width: 5.45rem;
  height: 0.96rem;
  line-height: 0.8266666667rem;
  background: url("../images/count-down.png") no-repeat 0 0/100% 100%;
@@ -174,9 +222,10 @@ body {
  height: 0.7733333333rem;
  background: url("../images/name-bg.png") no-repeat 0 0/100% 100%;
  text-align: center;
-  font-size: 0.2666666667rem;
+  font-size: 0.3333333333rem;
  font-weight: bold;
  color: white;
+  line-height: 0.6rem;
 }
 .wrap .game-area .select-time ul li .name.general {
  height: 0.6133333333rem;
@@ -293,16 +342,37 @@ body {
  background: url("../images/tip.png") no-repeat 0 0/100% 100%;
  text-align: center;
  font-size: 0.2933333333rem;
-  color: rgba(255, 240, 199, 0.6);
+  color: #FFF0C799;
  font-weight: bold;
 }
+.wrap .game-area .wait-time-s {
+  width: 10rem;
+  height: 9.0666666667rem;
+  position: absolute;
+  top: 1.5rem;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 5;
+}
+.wrap .game-area .wait-time-x {
+  width: 10rem;
+  height: 9.0666666667rem;
+  position: absolute;
+  top: 1.4rem;
+  left: 50%;
+  transform: translateX(-50%);
+}
 .wrap .game-area .draw-time {
  display: none;
-  width: 2.8rem;
+  width: 55%;
  height: 2.84rem;
-  margin: 1.2rem auto 0.2rem;
-  background: url(../images/drawBg.png);
+  margin: 1.8rem auto 0.2rem;
  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-flow: row wrap;
+  box-sizing: border-box;
 }
 .wrap .game-area .draw-time .count-down,
 .wrap .game-area .draw-time .current-tip {
@@ -333,7 +403,7 @@ body {
  position: absolute;
  left: 50%;
  transform: translateX(-50%);
-  bottom: 3.1rem;
+  bottom: 2.3rem;
  width: 100%;
  height: 4rem;
 }
@@ -383,13 +453,18 @@ body {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no1 .nick {
  width: 100%;
+  height: 1rem;
+  line-height: 0.6rem;
  font-size: 0.2933333333rem;
  color: #fff;
  text-align: center;
  position: absolute;
-  top: 1.1733333333rem;
+  top: 1.1333333333rem;
  left: 50%;
  transform: translateX(-50%);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no1 .num {
  width: 100%;
@@ -435,13 +510,18 @@ body {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no2 .nick {
  width: 100%;
+  height: 1rem;
+  line-height: 0.6rem;
  font-size: 0.2933333333rem;
  color: #fff;
  text-align: center;
  position: absolute;
-  top: 1.0133333333rem;
+  top: 0.9333333333rem;
  left: 50%;
  transform: translateX(-50%);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no2 .num {
  width: 100%;
@@ -488,13 +568,18 @@ body {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no3 .nick {
  width: 100%;
+  height: 1rem;
+  line-height: 0.6rem;
  font-size: 0.2933333333rem;
  color: #fff;
  text-align: center;
  position: absolute;
-  top: 1.0133333333rem;
+  top: 0.9333333333rem;
  left: 50%;
  transform: translateX(-50%);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no3 .num {
  width: 100%;
@@ -513,15 +598,20 @@ body {
  color: #fff;
 }
 .wrap .game-area .draw-time .draw-pic {
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: 1.65rem;
  z-index: 1;
-  width: 1.3333333333rem;
+  width: 1.3466666667rem;
+  height: 1.3466666667rem;
+  margin: 0 auto 0;
+  background: url("../images/drawBg.png") no-repeat;
+  background-size: 100% 100%;
+  position: relative;
 }
 .wrap .game-area .draw-time .draw-pic img {
-  width: 100%;
+  width: 0.8rem;
+  position: absolute;
+  left: 50%;
+  top: 45%;
+  transform: translate(-50%, -50%);
 }
 .wrap .game-area .draw-time .award-info {
  width: 8rem;
@@ -529,7 +619,7 @@ body {
  position: absolute;
  left: 50%;
  transform: translateX(-50%);
-  top: 6.5rem;
+  top: 7.2rem;
  display: flex;
 }
 .wrap .game-area .draw-time .award-info .desc {
@@ -555,7 +645,7 @@ body {
  position: absolute;
  left: 50%;
  transform: translateX(-50%);
-  top: 3.8rem;
+  top: 4.5rem;
  display: flex;
 }
 .wrap .game-area .draw-time .put-wrap .put {
@@ -586,7 +676,7 @@ body {
 .wrap .game-area .draw-time .put-wrap .list .item p {
  width: 0.8266666667rem;
  height: 0.8266666667rem;
-  background: url(../images/record_bubble.png) no-repeat;
+  background: url("../images/record_bubble.png") no-repeat;
  background-size: 100% 100%;
 }
 .wrap .game-area .draw-time .put-wrap .list .item p .gift {
@@ -735,10 +825,11 @@ body {
  width: 8.8rem;
  height: 13.0666666667rem;
  background: white;
+  background: url(../images/myBoxBg.png) no-repeat;
+  background-size: 100% 100%;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top {
  height: 4.5333333333rem;
-  background-image: linear-gradient(#F49C35, #FFDD81);
  overflow: hidden;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap {
@@ -786,8 +877,8 @@ body {
  display: none;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar {
-  width: 1.76rem;
-  height: 2.3333333333rem;
+  width: 2.5866666667rem;
+  height: 2.5066666667rem;
  margin-bottom: 0.2666666667rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar p {
@@ -800,8 +891,9 @@ body {
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar img {
  position: relative;
  z-index: 9;
-  top: -1.8133333333rem;
-  left: 0.0266666667rem;
+  top: -2.1333333333rem;
+  left: 50%;
+  transform: translateX(-50%);
  width: 1.7066666667rem;
  height: 1.7066666667rem;
  border-radius: 50%;
@@ -819,29 +911,30 @@ body {
  margin: 0;
  margin-top: -0.2666666667rem;
  margin-bottom: 0.0533333333rem;
-  color: #ED7B50;
+  color: #FF5110;
  font-size: 0.32rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank {
  overflow: auto;
  position: absolute;
  width: 100%;
-  height: 7.2rem;
-  background-color: white;
+  height: 6.9rem;
  padding: 0.4rem 0.2666666667rem 0;
  box-sizing: border-box;
+  margin-top: 0.25rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li {
+  width: 90%;
  display: flex;
  align-items: center;
-  margin-bottom: 0.5333333333rem;
+  margin: 0 auto 0.5333333333rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .index {
  display: inline-block;
  width: 0.4rem;
  font-size: 0.4rem;
  font-weight: bold;
-  color: #333333;
+  color: #fff;
  text-align: center;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info {
@@ -859,12 +952,16 @@ body {
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info .others-nick {
  font-size: 0.3733333333rem;
  font-weight: bold;
-  color: #333333;
+  color: #fff;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num {
  font-size: 0.3466666667rem;
  font-weight: bold;
-  color: #ED7B50;
+  color: #fff;
+}
+.wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num b {
+  color: #FF5110;
+  font-weight: bold;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine {
  position: fixed;
@@ -873,8 +970,9 @@ body {
  z-index: 999;
  width: 100%;
  height: 1.3333333333rem;
-  background-color: rgba(0, 0, 0, 0.8);
-  padding: 0 0.2rem;
+  background: url(../images/mineBg.png) no-repeat;
+  background-size: 100% 100%;
+  padding: 0 0.7rem 0 0.2rem;
  box-sizing: border-box;
  display: flex;
  align-items: center;
@@ -900,11 +998,19 @@ body {
  font-size: 0.3733333333rem;
  font-weight: bold;
  color: white;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: 3.5rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num {
  font-size: 0.3466666667rem;
  font-weight: bold;
-  color: #ED7B50;
+  color: #fff;
+}
+.wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num b {
+  color: #FF5110;
+  font-weight: bold;
 }
 .wrap .shade-mask-fragmentNum {
  display: none;
@@ -989,7 +1095,7 @@ body {
  z-index: 99;
  width: 100%;
  height: 1.7333333333rem;
-  background: url("../images/mall/bottom.png") no-repeat 0 0/100% 100%;
+  background: url("../images/bottom.png") no-repeat 0 0/100% 100%;
  display: flex;
  align-items: center;
 }
--- a/view/peko/activity/act-ocean/css/index.scss
+++ b/view/peko/activity/act-ocean/css/index.scss
@@ -2,6 +2,10 @@
    @return $px / $rem+rem;
 }

+// @function prefixurl() {
+//     @return 'https://img.pekolive.com/'
+// }
+
@font-face {
    font-family: 'pingfang-bold';
    src: url('../../../common/fonts/PingFang\ Bold.ttf');
@@ -21,9 +25,10 @@
 html,
 body {
    font-family: 'din-medium';
-    background: #C8864C;
+    background: #531800;
    // 海浪svga过长
    overflow-x: hidden;
+    // height: 19rem;
 }

 .wrap {
@@ -34,7 +39,15 @@ body {

    .banner {
        width: 100%;
+        position: relative;

+        .subtitle {
+            position: absolute;
+            top: px2rem(9, );
+            right: px2rem(84, );
+            width: px2rem(140, );
+            height: px2rem(84, );
+        }
    }

    .rule,
@@ -57,24 +70,21 @@ body {
        // bottom: px2rem(1040);
    }

-    .previous-result {
+    // 往轮结果
+    .previous_Round_Result {
+        width: px2rem(707, );
+        height: px2rem(114, );
        position: absolute;
-        // bottom: px2rem(200);
-        top: px2rem(1120);
+        top: 16.1rem;
        left: 50%;
        transform: translateX(-50%);
-        width: px2rem(710);
-        height: px2rem(68);
-        font-family: 'pingfang-bold';
-        font-size: px2rem(30);
-        font-weight: bold;
-        color: white;
-        display: flex;
-        align-items: center;
-        background: url('../images/previous-result-bg.png') no-repeat 0 0/100% 100%;
+        background: url(../images/previous_Round_Result.png) no-repeat;
+        background-size: 100% 100%;
        z-index: 9;

        span {
+            color: #fff;
+            position: absolute;
            font-weight: bold;
            margin-left: px2rem(27);
            text-shadow: 1px 1px 0px#fc8321,
@@ -83,41 +93,134 @@ body {
                -1px -1px 0px#fc8321,
                1px 1px 0px#fc8321,
                -1px -1px 0px#fc8321;
+            font-size: px2rem(36, );
+            left: px2rem(0, );
+            bottom: 1.65rem;
+            background: url(../images/wljg.png) no-repeat;
+            background-size: 100% 100%;
+            width: px2rem(128, );
+            height: px2rem(38, );
+            position: absolute;
        }

-        .result-list {
-            display: flex;
+        .box {
+            width: px2rem(707, );
+            height: 100%;
+            position: absolute;
+            left: 0;
+            top: 0;
+            box-sizing: border-box;
+            padding: px2rem(19, ) px2rem(10, ) 0 px2rem(10, );
+            overflow-x: scroll;

-            p {
-                width: px2rem(40);
-                height: px2rem(40);
-                margin-left: px2rem(8);
-                background: url('../images/little-bubble.png') 0 0/100% 100%;
-
-                // &:nth-child(11){
-                //     width: px2rem(40, );
-                //     height: px2rem(42, );
-                //     margin-left: 0.25rem;
-                //     background: url('../images/btn_result.png') 0 0/100% 100%;
-                // }
-                img {
-                    width: 100%;
-                }
+            &::-webkit-scrollbar {
+                // width: 0;
+                height: 2px;
+                display: none;
            }

-        }
+            ul {
+                width: 35rem;
+                height: 100%;

-        .more-result {
-            width: px2rem(42);
-            height: px2rem(44);
-            margin-left: 0.2rem;
+                li {
+                    float: left;
+                    width: px2rem(122, );
+                    height: px2rem(73, );
+                    background: url(../images/previous_Round_Result_Li.png) no-repeat;
+                    background-size: 100% 100%;
+                    display: flex;
+                    justify-content: space-around;
+                    flex-wrap: wrap;
+                    box-sizing: border-box;
+                    align-items: center;
+                    margin-right: px2rem(8, );
+                    // padding: 0 px2rem(4, );

-            img {
-                width: 100%;
+                    p {
+                        display: block;
+                        width: px2rem(25, );
+                        height: px2rem(25, );
+                        background: url(../images/record_bubble.png) no-repeat;
+                        background-size: 100% 100%;
+                        position: relative;
+                        margin: 0 px2rem(2, );
+
+                        img {
+                            display: block;
+                            width: 80%;
+                            position: absolute;
+                            left: 50%;
+                            top: 50%;
+                            transform: translate(-50%, -50%);
+                        }
+                    }
+                }
            }
        }
    }

+    // .previous-result {
+    //     position: absolute;
+    //     // bottom: px2rem(200);
+    //     top: px2rem(1120);
+    //     left: 50%;
+    //     transform: translateX(-50%);
+    //     width: px2rem(710);
+    //     height: px2rem(68);
+    //     font-family: 'pingfang-bold';
+    //     font-size: px2rem(30);
+    //     font-weight: bold;
+    //     color: white;
+    //     display: flex;
+    //     align-items: center;
+    //     background: url('../images/previous-result-bg.png') no-repeat 0 0/100% 100%;
+    //     z-index: 9;
+
+    //     span {
+    //         font-weight: bold;
+    //         margin-left: px2rem(27);
+    //         text-shadow: 1px 1px 0px#fc8321,
+    //             -1px -1px 0px#fc8321,
+    //             1px 1px 0px#fc8321,
+    //             -1px -1px 0px#fc8321,
+    //             1px 1px 0px#fc8321,
+    //             -1px -1px 0px#fc8321;
+    //     }
+
+    //     .result-list {
+    //         display: flex;
+
+    //         p {
+    //             width: px2rem(40);
+    //             height: px2rem(40);
+    //             margin-left: px2rem(8);
+    //             background: url('../images/little-bubble.png') 0 0/100% 100%;
+
+    //             // &:nth-child(11){
+    //             //     width: px2rem(40, );
+    //             //     height: px2rem(42, );
+    //             //     margin-left: 0.25rem;
+    //             //     background: url('../images/btn_result.png') 0 0/100% 100%;
+    //             // }
+    //             img {
+    //                 width: 100%;
+    //             }
+    //         }
+
+    //     }
+
+    //     .more-result {
+    //         width: px2rem(42);
+    //         height: px2rem(44);
+    //         margin-left: 0.2rem;
+
+    //         img {
+    //             width: 100%;
+    //         }
+    //     }
+    // }
+
    .mall {
        position: absolute;
        top: px2rem(184);
@@ -140,6 +243,14 @@ body {
        height: px2rem(1054);
        background: url('../images/game-area.png') no-repeat 0 0/100% 100%;

+        .roundId {
+            font-size: px2rem(20, );
+            color: #701800;
+            position: absolute;
+            top: px2rem(12, );
+            left: px2rem(35, );
+        }
+
        // 等待倒计时30s
        .select-time {
            display: none;
@@ -151,7 +262,8 @@ body {
                top: px2rem(-40);
                left: 50%;
                transform: translateX(-50%);
-                width: px2rem(322);
+                // width: px2rem(322);
+                width: 5.45rem;
                height: px2rem(72);
                line-height: px2rem(62);
                background: url('../images/count-down.png') no-repeat 0 0/100% 100%;
@@ -223,9 +335,10 @@ body {
                        height: px2rem(58);
                        background: url('../images/name-bg.png') no-repeat 0 0/100% 100%;
                        text-align: center;
-                        font-size: px2rem(20);
+                        font-size: px2rem(25);
                        font-weight: bold;
                        color: white;
+                        line-height: 0.6rem;

                        &.general {
                            height: px2rem(46);
@@ -381,16 +494,43 @@ body {

        }

+        // 动画上
+        .wait-time-s {
+            width: px2rem(750, );
+            height: px2rem(680, );
+            position: absolute;
+            top: 1.5rem;
+            left: 50%;
+            transform: translateX(-50%);
+            z-index: 5;
+        }
+
+        // 动画下
+        .wait-time-x {
+            width: px2rem(750, );
+            height: px2rem(680, );
+            position: absolute;
+            top: 1.4rem;
+            left: 50%;
+            transform: translateX(-50%);
+        }
+
        // 开奖时间
        .draw-time {
            display: none;
            // width: px2rem(750);
            // height: px2rem(600);
-            width: px2rem(210, );
+            // width: px2rem(210, );
+            width: 55%;
            height: px2rem(213, );
-            margin: 1.2rem auto 0.2rem;
-            background: url(../images/drawBg.png);
+            margin: 1.8rem auto 0.2rem;
+            // background: url('../images/drawBg.png');
            background-size: 100% 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-flow: row wrap;
+            box-sizing: border-box;

            .count-down,
            .current-tip {
@@ -423,7 +563,7 @@ body {
                position: absolute;
                left: 50%;
                transform: translateX(-50%);
-                bottom: 3.1rem;
+                bottom: 2.3rem;
                width: 100%;
                height: 4rem;

@@ -482,13 +622,18 @@ body {

                        .nick {
                            width: 100%;
+                            height: 1rem;
+                            line-height: 0.6rem;
                            font-size: px2rem(22, );
                            color: #fff;
                            text-align: center;
                            position: absolute;
-                            top: px2rem(88, );
+                            top: px2rem(85, );
                            left: 50%;
                            transform: translateX(-50%);
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis; //溢出显示省略号
                        }

                        .num {
@@ -545,13 +690,18 @@ body {

                        .nick {
                            width: 100%;
+                            height: 1rem;
+                            line-height: 0.6rem;
                            font-size: px2rem(22, );
                            color: #fff;
                            text-align: center;
                            position: absolute;
-                            top: px2rem(76, );
+                            top: px2rem(70, );
                            left: 50%;
                            transform: translateX(-50%);
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis; //溢出显示省略号
                        }

                        .num {
@@ -606,13 +756,18 @@ body {

                        .nick {
                            width: 100%;
+                            height: 1rem;
+                            line-height: 0.6rem;
                            font-size: px2rem(22, );
                            color: #fff;
                            text-align: center;
                            position: absolute;
-                            top: px2rem(76, );
+                            top: px2rem(70, );
                            left: 50%;
                            transform: translateX(-50%);
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis; //溢出显示省略号
                        }

                        .num {
@@ -638,21 +793,42 @@ body {
            }

            .draw-pic {
-                position: absolute;
-                left: 50%;
-                transform: translateX(-50%);
-                top: 1.65rem;
                z-index: 1;
-                width: px2rem(100);
-                // height: px2rem(91);
+                width: px2rem(101, );
+                // width: 25%; 
+                height: px2rem(101, );
+                margin: 0 auto 0;
+                background: url('../images/drawBg.png') no-repeat;
+                background-size: 100% 100%;
+                position: relative;

                img {
-                    width: 100%;
-                    // height: 100%;
+                    width: px2rem(60, );
                    // margin: -0.3rem 0 0 1.18rem;
+                    position: absolute;
+                    left: 50%;
+                    top: 45%;
+                    transform: translate(-50%, -50%);
                }
            }

+            // .draw-pic {
+            //     position: absolute;
+            //     left: 50%;
+            //     transform: translateX(-50%);
+            //     top: 1.65rem;
+            //     z-index: 1;
+            //     width: px2rem(100);
+            //     background: url('../images/drawBg.png');
+            //     // height: px2rem(91);
+
+            //     img {
+            //         width: 100%;
+            //         // height: 100%;
+            //         // margin: -0.3rem 0 0 1.18rem;
+            //     }
+            // }
+
            .award-info {
                width: px2rem(600, );
                // height: px2rem(183, );
@@ -660,7 +836,7 @@ body {
                position: absolute;
                left: 50%;
                transform: translateX(-50%);
-                top: 6.5rem;
+                top: 7.2rem;
                display: flex;

                .desc {
@@ -694,7 +870,8 @@ body {
                position: absolute;
                left: 50%;
                transform: translateX(-50%);
-                top: 3.8rem;
+                // top: 3.8rem;
+                top: 4.5rem;
                display: flex;

                .put {
@@ -728,7 +905,7 @@ body {
                        p {
                            width: px2rem(62, );
                            height: px2rem(62, );
-                            background: url(../images/record_bubble.png) no-repeat;
+                            background: url('../images/record_bubble.png') no-repeat;
                            background-size: 100% 100%;

                            .gift {
@@ -911,10 +1088,12 @@ body {
            width: px2rem(660);
            height: px2rem(980);
            background: white;
+            background: url(../images/myBoxBg.png) no-repeat;
+            background-size: 100% 100%;

            .rank-top {
                height: px2rem(340);
-                background-image: linear-gradient(#F49C35, #FFDD81);
+                // background-image: linear-gradient(#F49C35, #FFDD81);
                overflow: hidden;

                .tab-wrap {
@@ -970,8 +1149,8 @@ body {
                        }

                        .avatar {
-                            width: px2rem(132);
-                            height: px2rem(175);
+                            width: px2rem(194);
+                            height: px2rem(188);
                            margin-bottom: px2rem(20);

                            p {
@@ -985,8 +1164,10 @@ body {
                            img {
                                position: relative;
                                z-index: 9;
-                                top: px2rem(-136);
-                                left: px2rem(2);
+                                top: px2rem(-160);
+                                // left: px2rem(2);
+                                left: 50%;
+                                transform: translateX(-50%);
                                width: px2rem(128);
                                height: px2rem(128);
                                border-radius: 50%;
@@ -1007,7 +1188,7 @@ body {
                            margin: 0;
                            margin-top: px2rem(-20);
                            margin-bottom: px2rem(4);
-                            color: #ED7B50;
+                            color: #FF5110;
                            font-size: px2rem(24);
                        }
                    }
@@ -1018,15 +1199,18 @@ body {
                overflow: auto;
                position: absolute;
                width: 100%;
-                height: px2rem(540);
-                background-color: white;
+                height: 6.9rem;
+                // background-color: white;
                padding: px2rem(30) px2rem(20) 0;
                box-sizing: border-box;
+                margin-top: 0.25rem;

                li {
+                    width: 90%;
                    display: flex;
                    align-items: center;
-                    margin-bottom: px2rem(40);
+                    // margin-bottom: px2rem(40);
+                    margin: 0 auto px2rem(40, );

                    &:last-child {
                        // margin-bottom: px2rem(140);
@@ -1037,7 +1221,7 @@ body {
                        width: px2rem(30);
                        font-size: px2rem(30);
                        font-weight: bold;
-                        color: #333333;
+                        color: #fff;
                        text-align: center;
                    }

@@ -1057,14 +1241,19 @@ body {
                        .others-nick {
                            font-size: px2rem(28);
                            font-weight: bold;
-                            color: #333333;
+                            color: #fff;
                        }
                    }

                    .others-diamond-num {
                        font-size: px2rem(26);
                        font-weight: bold;
-                        color: #ED7B50;
+                        color: #fff;
+
+                        b {
+                            color: #FF5110;
+                            font-weight: bold;
+                        }
                    }
                }
            }
@@ -1076,8 +1265,10 @@ body {
                z-index: 999;
                width: 100%;
                height: px2rem(100);
-                background-color: rgba($color: #000000, $alpha: .8);
-                padding: 0 px2rem(15);
+                // background-color: rgba($color: #000000, $alpha: .8);
+                background: url(../images/mineBg.png) no-repeat;
+                background-size: 100% 100%;
+                padding: 0 0.7rem 0 0.2rem;
                box-sizing: border-box;
                display: flex;
                align-items: center;
@@ -1105,13 +1296,22 @@ body {
                        font-size: px2rem(28);
                        font-weight: bold;
                        color: white;
+                        overflow: hidden; //超出隐藏
+                        white-space: nowrap; //不折行
+                        text-overflow: ellipsis;
+                        width: 3.5rem;
                    }
                }

                .mine-diamond-num {
                    font-size: px2rem(26);
                    font-weight: bold;
-                    color: #ED7B50;
+                    color: #fff;
+
+                    b {
+                        color: #FF5110;
+                        font-weight: bold;
+                    }
                }
            }
        }
@@ -1210,7 +1410,7 @@ body {
    z-index: 99;
    width: 100%;
    height: px2rem(130);
-    background: url('../images/mall/bottom.png') no-repeat 0 0/100% 100%;
+    background: url('../images/bottom.png') no-repeat 0 0/100% 100%;
    display: flex;
    align-items: center;

--- a/view/peko/activity/act-ocean/css/record.css
+++ b/view/peko/activity/act-ocean/css/record.css
@@ -46,8 +46,8 @@ body {
 }
 .record-list li {
  width: 100%;
-  height: 6.9733333333rem;
-  background: url(../images/record/record-bg.png) no-repeat;
+  height: 8.48rem;
+  background: url("../images/record/record-bg.png") no-repeat;
  background-size: 100% 100%;
  border-radius: 0.2666666667rem;
  overflow: hidden;
@@ -65,16 +65,21 @@ body {
  height: 0.5866666667rem;
  line-height: 0.5866666667rem;
  background: #F46331;
+  display: flex;
  box-sizing: border-box;
  padding: 0 0.2666666667rem;
  margin: 0.2rem auto 0;
 }
 .record-list li .goldBox p {
  color: #fff;
-  width: 100%;
+  width: 50%;
  text-align: center;
  display: none;
 }
+.record-list li .goldBox span {
+  color: #FFF773;
+  font-size: 0.2666666667rem;
+}
 .record-list li .result-wrap {
  width: 84%;
  height: 1.2133333333rem;
@@ -83,6 +88,7 @@ body {
  margin: 0.0666666667rem auto 0.3333333333rem;
  display: flex;
  justify-content: space-between;
+  position: relative;
 }
 .record-list li .result-wrap .result {
  display: flex;
@@ -93,21 +99,21 @@ body {
  color: #FFFFFF;
  padding-right: 0.1866666667rem;
  font-weight: 600;
-}
-.record-list li .result-wrap .result .bg {
-  width: 1.2133333333rem;
-  height: 1.2133333333rem;
-  background: url(../images/record_bubble_act.png) no-repeat;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 1.9066666667rem;
+  height: 0.6rem;
+  background: url(../images/record/result.png) no-repeat;
  background-size: 100% 100%;
-  text-align: center;
-}
-.record-list li .result-wrap .result .bg img {
-  width: 75%;
-  margin-top: 0.15rem;
+  top: 0.2rem;
 }
 .record-list li .result-wrap .award {
  display: flex;
  align-items: center;
+  position: absolute;
+  right: 0rem;
+  top: -0.1rem;
 }
 .record-list li .result-wrap .award p,
 .record-list li .result-wrap .award b {
@@ -119,25 +125,57 @@ body {
  width: 0.3733333333rem;
  height: 0.3733333333rem;
 }
+.record-list li .result-wrap .result_sBox {
+  width: 8.8rem;
+  height: 1.1466666667rem;
+  margin: 1rem auto 0;
+  display: flex;
+  justify-content: center;
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.record-list li .result-wrap .result_sBox .bg {
+  width: 1.1466666667rem;
+  height: 1.1466666667rem;
+  background: url("../images/record_bubble_act.png") no-repeat;
+  background-size: 100% 100%;
+  text-align: center;
+}
+.record-list li .result-wrap .result_sBox .bg img {
+  width: 75%;
+  display: block;
+  margin: 0.1333333333rem auto 0;
+}
 .record-list li .put-wrap {
  width: 84%;
  height: 1.2133333333rem;
  line-height: 1.2133333333rem;
  box-sizing: border-box;
-  margin: 0 auto;
+  margin: 2rem auto 0;
  display: flex;
+  position: relative;
 }
 .record-list li .put-wrap .put {
  font-size: 0.3733333333rem;
  color: #FFFFFF;
  font-weight: 600;
  margin-right: 0.9rem;
+  position: absolute;
+  width: 1.0266666667rem;
+  height: 0.6rem;
+  left: 50%;
+  transform: translateX(-50%);
+  background: url(../images/record/touru.png) no-repeat;
+  background-size: 100% 100%;
+  top: -0.6rem;
 }
 .record-list li .put-wrap .list {
  width: 6.72rem;
  height: 2.7733333333rem;
  display: flex;
  flex-wrap: wrap;
+  margin: 0.3rem auto 0;
 }
 .record-list li .put-wrap .list .item {
  width: 0.9866666667rem;
@@ -154,7 +192,7 @@ body {
 .record-list li .put-wrap .list .item p {
  width: 0.8266666667rem;
  height: 0.8266666667rem;
-  background: url(../images/record_bubble.png) no-repeat;
+  background: url("../images/record_bubble.png") no-repeat;
  background-size: 100% 100%;
 }
 .record-list li .put-wrap .list .item p .gift {
@@ -171,7 +209,8 @@ body {
 }
 .record-list li .put-wrap .list .item div .diamond {
  width: 0.3333333333rem;
-  height: 0.2666666667rem;
+  height: 0.3333333333rem;
+  margin-top: -0.01rem;
 }
 .record-list li .put-wrap .list .item div .in {
  font-size: 0.2666666667rem;
--- a/view/peko/activity/act-ocean/css/record.scss
+++ b/view/peko/activity/act-ocean/css/record.scss
@@ -2,6 +2,10 @@
    @return $px / $rem+rem;
 }

+// @function prefixurl() {
+//     @return 'https://img.pekolive.com/'
+// }
+
@font-face {
    font-family: 'pingfang-bold';
    src: url('../../../common/fonts/PingFang\ Bold.ttf');
@@ -60,9 +64,9 @@ body {

    li {
        width: 100%;
-        height: px2rem(523, );
+        height: px2rem(636, );
        // background: linear-gradient(0deg, #46BBC1 0%, #62DEE4 100%);
-        background: url(../images/record/record-bg.png) no-repeat;
+        background: url('../images/record/record-bg.png') no-repeat;
        background-size: 100% 100%;
        border-radius: px2rem(20, );
        overflow: hidden;
@@ -82,7 +86,7 @@ body {
            height: px2rem(44, );
            line-height: px2rem(44, );
            background: #F46331;
-            // display: flex;
+            display: flex;
            // justify-content: space-between;
            box-sizing: border-box;
            padding: 0 px2rem(20, );
@@ -90,15 +94,15 @@ body {

            p {
                color: #fff;
-                width: 100%;
+                width: 50%;
                text-align: center;
                display: none;
            }

-            // span {
-            //     color: #fff;
-            //     font-size: px2rem(28, );
-            // }
+            span {
+                color: #FFF773;
+                font-size: px2rem(20, );
+            }

            // .gold {
            //     font-size: px2rem(26, );
@@ -114,6 +118,7 @@ body {
            margin: px2rem(5, ) auto px2rem(25, );
            display: flex;
            justify-content: space-between;
+            position: relative;

            .result {
                display: flex;
@@ -124,26 +129,39 @@ body {
                    color: #FFFFFF;
                    padding-right: px2rem(14, );
                    font-weight: 600;
-                }
-
-                .bg {
-                    width: px2rem(91, );
-                    height: px2rem(91, );
-                    background: url(../images/record_bubble_act.png) no-repeat;
+                    position: absolute;
+                    left: 50%;
+                    transform: translateX(-50%);
+                    width: px2rem(143, );
+                    height: px2rem(45, );
+                    background: url(../images/record/result.png) no-repeat;
                    background-size: 100% 100%;
-                    text-align: center;
-
-                    img {
-                        width: 75%;
-                        margin-top: 0.15rem;
-                    }
+                    top: 0.2rem;
                }

+                // .bg {
+                //     width: px2rem(91, );
+                //     height: px2rem(91, );
+                //     background: url('../images/record_bubble_act.png') no-repeat;
+                //     background-size: 100% 100%;
+                //     text-align: center;
+
+                //     img {
+                //         width: 75%;
+                //         margin-top: 0.15rem;
+                //     }
+                // }
+
            }

            .award {
                display: flex;
                align-items: center;
+                position: absolute;
+                // right: 0.8rem;
+                // top: 1.8rem;
+                right: 0rem;
+                top: -0.1rem;

                p,
                b {
@@ -157,6 +175,31 @@ body {
                    height: px2rem(28, );
                }
            }
+
+            .result_sBox {
+                width: px2rem(660, );
+                height: px2rem(86, );
+                margin: 1rem auto 0;
+                display: flex;
+                justify-content: center;
+                position: relative;
+                left: 50%;
+                transform: translateX(-50%);
+
+                .bg {
+                    width: px2rem(86, );
+                    height: px2rem(86, );
+                    background: url('../images/record_bubble_act.png') no-repeat;
+                    background-size: 100% 100%;
+                    text-align: center;
+
+                    img {
+                        width: 75%;
+                        display: block;
+                        margin: px2rem(10, ) auto 0;
+                    }
+                }
+            }
        }

        .put-wrap {
@@ -164,14 +207,23 @@ body {
            height: px2rem(91, );
            line-height: px2rem(91, );
            box-sizing: border-box;
-            margin: 0 auto;
+            margin: 2rem auto 0;
            display: flex;
+            position: relative;

            .put {
                font-size: px2rem(28, );
                color: #FFFFFF;
                font-weight: 600;
                margin-right: 0.9rem;
+                position: absolute;
+                width: px2rem(77, );
+                height: px2rem(45, );
+                left: 50%;
+                transform: translateX(-50%);
+                background: url(../images/record/touru.png) no-repeat;
+                background-size: 100% 100%;
+                top: -0.6rem;
            }

            .list {
@@ -179,6 +231,7 @@ body {
                height: px2rem(208, );
                display: flex;
                flex-wrap: wrap;
+                margin: 0.3rem auto 0;

                .item {
                    width: px2rem(74, );
@@ -197,7 +250,7 @@ body {
                    p {
                        width: px2rem(62, );
                        height: px2rem(62, );
-                        background: url(../images/record_bubble.png) no-repeat;
+                        background: url('../images/record_bubble.png') no-repeat;
                        background-size: 100% 100%;

                        .gift {
@@ -216,7 +269,8 @@ body {

                        .diamond {
                            width: px2rem(25, );
-                            height: px2rem(20, );
+                            height: px2rem(25, );
+                            margin-top: -0.01rem;
                        }

                        .in {
--- a/view/peko/activity/act-ocean/css/result.css
+++ b/view/peko/activity/act-ocean/css/result.css
@@ -17,7 +17,7 @@ body {
 .header {
  width: 10rem;
  height: 4.2266666667rem;
-  background: url(../images/result_main.png);
+  background: url("../images/result_main.png");
  background-size: 100% 100%;
  margin: 0 auto;
  position: relative;
@@ -45,7 +45,7 @@ body {
 .main {
  width: 10rem;
  height: 15.6rem;
-  background: url(../images/game-area.png);
+  background: url("../images/game-area.png");
  background-size: 100% 100%;
  margin: -1.85rem auto 0;
  position: relative;
@@ -55,7 +55,7 @@ body {
  width: 9.4533333333rem;
  height: 1.1466666667rem;
  line-height: 1.1466666667rem;
-  background: url(../images/result_list_bg.png);
+  background: url("../images/result_list_bg.png");
  background-size: 100% 100%;
  box-sizing: border-box;
  margin: 0 auto 0.24rem;
@@ -86,7 +86,7 @@ body {
  height: 0.8266666667rem;
  line-height: 1.1466666667rem;
  margin-left: 0.4666666667rem;
-  background: url(../images/record_bubble.png);
+  background: url("../images/record_bubble.png");
  background-size: 100% 100%;
 }
 .main li .list p img {
--- a/view/peko/activity/act-ocean/css/result.scss
+++ b/view/peko/activity/act-ocean/css/result.scss
@@ -1,6 +1,10 @@
@function px2rem($px, $rem: 75) {
    @return $px / $rem+rem;
 }
+@function prefixurl() {
+    @return 'https://img.pekolive.com/'
+}
+

@font-face {
    font-family: 'pingfang-bold';
@@ -27,7 +31,7 @@ body {
 .header {
    width: px2rem(750, );
    height: px2rem(317, );
-    background: url(../images/result_main.png);
+    background: url('../images/result_main.png');
    background-size: 100% 100%;
    margin: 0 auto;
    position: relative;
@@ -57,7 +61,7 @@ body {
 .main {
    width: px2rem(750, );
    height: px2rem(1170, );
-    background: url(../images/game-area.png);
+    background: url('../images/game-area.png');
    background-size: 100% 100%;
    margin: -1.85rem auto 0;
    position: relative;
@@ -67,7 +71,7 @@ body {
        width: px2rem(709, );
        height: px2rem(86, );
        line-height: px2rem(86, );
-        background: url(../images/result_list_bg.png);
+        background: url('../images/result_list_bg.png');
        background-size: 100% 100%;
        box-sizing: border-box;
        margin: 0 auto 0.24rem;
@@ -101,7 +105,7 @@ body {
                height: px2rem(62, );
                line-height: px2rem(86, );
                margin-left: px2rem(35, );
-                background: url(../images/record_bubble.png);
+                background: url('../images/record_bubble.png');
                background-size: 100% 100%;

                img {
--- a/view/peko/activity/act-ocean/images/first.png
+++ b/view/peko/activity/act-ocean/images/first.png
--- a/view/peko/activity/act-ocean/images/game-area.png
+++ b/view/peko/activity/act-ocean/images/game-area.png
--- a/view/peko/activity/act-ocean/images/mineBg.png
+++ b/view/peko/activity/act-ocean/images/mineBg.png
--- a/view/peko/activity/act-ocean/images/myBoxBg.png
+++ b/view/peko/activity/act-ocean/images/myBoxBg.png
--- a/view/peko/activity/act-ocean/images/previous_Round_Result.png
+++ b/view/peko/activity/act-ocean/images/previous_Round_Result.png
--- a/view/peko/activity/act-ocean/images/previous_Round_Result_Li.png
+++ b/view/peko/activity/act-ocean/images/previous_Round_Result_Li.png
--- a/view/peko/activity/act-ocean/images/record/record-bg.png
+++ b/view/peko/activity/act-ocean/images/record/record-bg.png
--- a/view/peko/activity/act-ocean/images/record/result.png
+++ b/view/peko/activity/act-ocean/images/record/result.png
--- a/view/peko/activity/act-ocean/images/record/touru.png
+++ b/view/peko/activity/act-ocean/images/record/touru.png
--- a/view/peko/activity/act-ocean/images/s.svga
+++ b/view/peko/activity/act-ocean/images/s.svga
--- a/view/peko/activity/act-ocean/images/subtitle.png
+++ b/view/peko/activity/act-ocean/images/subtitle.png
--- a/view/peko/activity/act-ocean/images/t2.png
+++ b/view/peko/activity/act-ocean/images/t2.png
--- a/view/peko/activity/act-ocean/images/t3.png
+++ b/view/peko/activity/act-ocean/images/t3.png
--- a/view/peko/activity/act-ocean/images/wait.svga
+++ b/view/peko/activity/act-ocean/images/wait.svga
--- a/view/peko/activity/act-ocean/images/wait1.svga
+++ b/view/peko/activity/act-ocean/images/wait1.svga
--- a/view/peko/activity/act-ocean/images/wljg.png
+++ b/view/peko/activity/act-ocean/images/wljg.png
--- a/view/peko/activity/act-ocean/images/x.svga
+++ b/view/peko/activity/act-ocean/images/x.svga
--- a/view/peko/activity/act-ocean/index.html
+++ b/view/peko/activity/act-ocean/index.html
@@ -8,13 +8,16 @@
    <title>星级厨房</title>

    <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/index.css">
+    <link rel="stylesheet" href="./css/index.css?v=2.2">
 </head>

 <body>
    <div class="wrap no-in-app">
        <!-- <div class="wrap "> -->
-        <div class="banner"><img src="./images/banner.png" alt=""></div>
+        <div class="banner">
+            <img src="./images/banner.png" alt="">
+            <img class="subtitle" src="./images/subtitle.png" alt="">
+        </div>
        <div class="rule"><img src="./images/rule.png" alt=""></div>
        <div class="record"><img src="./images/record.png" alt=""></div>

@@ -33,7 +36,9 @@
            <div class="recharge"><img src="./images/mall/recharge.png" alt=""></div>
        </div>
        <!-- 游戏区域 -->
-        <div class="game-area">
+        <div class="game-area" style="display: none;">
+            <!-- 本轮轮次 -->
+            <div class="roundId"></div>
            <!-- 选择时间 -->
            <div class="select-time">
                <div class="count-down">开奖倒计时：<span class="count-down-num"></span>秒</div>
@@ -61,9 +66,9 @@
                <div class="count-down">下一轮：<span class="count-down-num"></span>秒</div>
                <div class="current-tip">本轮结果：<span class="current-result"></span></div>
                <!-- 中奖物品展示 -->
-                <div class="draw-pic">
-                    <img src="" alt="">
-                </div>
+                <!-- <div class="draw-pic">
+                    <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                </div> -->
                <!-- 投入列表 -->
                <div class="put-wrap">
                    <div class="put">投入</div>
@@ -71,7 +76,7 @@
                        <!-- <div class="item">
                            <p><img src="" class="gift" alt=""></p>
                            <div>
-                                <img src="./images/diamond.png" class="diamond" alt="">
+                                <img src="diamond.png" class="diamond" alt="">
                                <span class="in"></span>
                            </div>
                        </div> -->
@@ -97,7 +102,7 @@
                            <div class="nick">虚位以待</div>
                            <div class="num">
                                <img src="./images/diamond.png" class="diamond" alt="">
-                                <span></span>
+                                <span>0</span>
                            </div>
                        </div>
                        <div class="no no2">
@@ -106,7 +111,7 @@
                            <div class="nick">虚位以待</div>
                            <div class="num">
                                <img src="./images/diamond.png" class="diamond" alt="">
-                                <span></span>
+                                <span>0</span>
                            </div>
                        </div>
                        <div class="no no3">
@@ -115,17 +120,28 @@
                            <div class="nick">虚位以待</div>
                            <div class="num">
                                <img src="./images/diamond.png" class="diamond" alt="">
-                                <span></span>
+                                <span>0</span>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
+            <!-- 动画上 -->
+            <div class="wait-time-s"></div>
+            <!-- 动画下 -->
+            <div class="wait-time-x"></div>
        </div>

        <!-- 往轮结果 -->
-        <div class="previous-result">
-            <span>往轮结果</span>
+        <div class="previous_Round_Result">
+            <span></span>
+            <div class="box">
+                <ul>
+                </ul>
+            </div>
+        </div>
+        <!-- <div class="previous-result">
+            <span>往輪結果</span>
            <div class="result-list">
                <p><img src="" alt=""></p>
                <p><img src="" alt=""></p>
@@ -137,10 +153,10 @@
                <p><img src="" alt=""></p>
                <p><img src="" alt=""></p>
                <p><img src="" alt=""></p>
-                <!-- <p><img src="" alt=""></p> -->
+                <p><img src="" alt=""></p>
            </div>
            <span class="more-result"><img src="./images/btn_result.png" alt=""></span>
-        </div>
+        </div> -->

        <!-- 个人信息 -->
        <div class="info-bottom">
@@ -158,22 +174,22 @@
            <div class="shade-content">
                <main>
                    <div class="cyfs">
-                        <p class="title">参与方式</p>
+                        <p class="title">參與方式</p>
                        用戶可通過花費鉆石參與《星級廚房》遊戲，每次最少消耗100鉆石，每回合時間30秒
                        <p class="jietu"><img src="./images/t1.png" alt=""></p>
                    </div>
                    <div class="lwff">
-                        <p class="title">礼物发放</p>
-                        每次參與遊戲後會獲得一次禮物開獎機會
+                        <p class="title">禮物發放</p>
+                        每次參與遊戲後會獲得一次禮物開獎;
                        <p class="jietu t2"><img src="./images/t2.png" alt=""></p>
-                        每次隨機從8種食材中選取一個作為中獎物品，中獎後獲得【中獎物品購買碎片數*中獎物品對應倍數*100】的鉆石獎勵，鉆石將直接發放到錢包
+                        每次隨機從8種食材中選取一個或多個作為中獎食材，中獎後獲得（中獎物品所花費的鉆石數*中獎食材對應倍數）的鉆石獎勵，當中獎多個食材時，獲得的鉆石會同時發放。鉆石將直接發放到賬戶中。
                        <p class="jietu t3"><img src="./images/t3.png" alt=""></p>
-                        例如購買1個5倍的番茄，中獎後獲得1*5*100的鉆石
+                        例如購買1個5倍番茄花費100鉆，購買1個蘿蔔花費100鉆，中獎後將獲得100*5+100*5=1000鉆。
                    </div>
                    <div class="qtsm">
                        <p class="title">其他說明</p>
-                        如果以上說明未能解答您的疑問，請聯系客服，會有專人解答疑難
-                        <p>本活动与苹果公司无关</p>
+                        如果以上說明未能解答您的疑問，請聯繫客服，會有專人解答疑難
+                        <p>本活動與蘋果公司無關</p>
                    </div>
                </main>
            </div>
@@ -224,12 +240,12 @@
    </div>
    <script src="../../common/js/flexible.js"></script>
    <script src="../../common/js/jquery-3.2.1.min.js"></script>
-    <script src="./js/jquery-animate-css-rotate-scale.js"></script>
    <script src="../../common/js/common2.js"></script>
+    <script src="./js/jquery-animate-css-rotate-scale.js"></script>
    <script src="../../common/js/layer.js"></script>
    <script src="../../common/js/vconsole.min.js"></script>
    <script src="../../common/js/svga.min.js"></script>
-    <script src="./js/index.js"></script>
+    <script src="./js/index.js?v=2.2"></script>
 </body>

 </html>
--- a/view/peko/activity/act-ocean/js/index.js
+++ b/view/peko/activity/act-ocean/js/index.js
@@ -17,7 +17,8 @@ const showLoading = (content = '加載中...') => {
        shadeClose: false,
        content,
        success (e) {
-            layerIndex = $(e).attr('index')
+            layerIndex = $(e).attr('index');
+            $('.layui-m-layer').css("z-index", '9999');
        }
    })
 }
@@ -31,14 +32,19 @@ const toastMsg = (content = '操作完成', time = 2) => {
        skin: 'msg'
    })
 }
-
-if (!browser.app) { //false
+if (false) { //!browser.app
    toastMsg('請在app內打開！');
 } else {
    $('.wrap').removeClass('no-in-app')
 }
-
-
+console.log(document.body.clientWidth);
+console.log(document.body.clientHeight);
+if (document.body.clientHeight <= 700) {
+    $('body,html').css({ "height": '19.2rem' });
+}
+if (document.body.clientWidth >= 365) {
+    $('body,html').css({ "height": '19.2rem' });
+}
 // 獲取用戶相關信息
 let myFragment
 const getUserInfo = (param) => {
@@ -135,9 +141,10 @@ const getNewestAct = () => {
                    } else {
                        clearTimeout(timer2)
                        hideLoading(layerIndex)
-
                        roundId = res.data.roundId
+                        $('.game-area .roundId').html(roundId)
                        getListItem(roundId, modelType)
+                        getPreviousResults(20, roundId)

                        // 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload()
                        if (roundIdArr.length < 2) {
@@ -160,7 +167,7 @@ const getNewestAct = () => {
                        showResultStageStartTime = res.data.showResultStageStartTime
                        endTime = res.data.endTime
                        console.log('獲取5個時間戳的值-----', 'timestamp:', userComeinTime, 'startTime:', startTime, 'drawStageStartTime:', drawStageStartTime, 'showResultStageStartTime:', showResultStageStartTime, 'endTime:', endTime);
-                        showView()
+                        showView(res.data.drawItemList)
                    }
                }
            } else {
@@ -194,12 +201,13 @@ let mySelect
 let fragmentNum
 let reg = /^[0-9]*$/

-const showView = () => {
+const showView = (drawItemList) => {
    if (startTime <= userComeinTime && userComeinTime < drawStageStartTime) {
        // 第一階段
        console.log('進入第一階段');
        isSelectTab = false
        $('.select-time').show().siblings().hide()
+        $('.roundId').show()
        $countDown = $('.select-time .count-down .count-down-num')

        mySelect = sessionStorage.getItem("mySelect")
@@ -215,11 +223,8 @@ const showView = () => {

        $('.award-wrap').html('').show()
        // $('.award-info .desc').html('')
-
-        getPreviousResults(10, roundId)
        showCountDown(userComeinTime, startTime, drawStageStartTime)
        getUserInfo()
-
    } else if (drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime) {
        // 第二階段
        console.log('進入第二階段');
@@ -227,6 +232,7 @@ const showView = () => {
        sessionStorage.removeItem("mySelect")

        $('.wait-time').show().siblings().hide()
+        $('.roundId').show()
        $countDown = $('.wait-time .count-down .count-down-num')

        clearTimeout(timer2s) //清除第一階段的2s氣泡定時器
@@ -236,16 +242,13 @@ const showView = () => {
        console.log('isStatus2的值------------', isStatus2);

        // $('.btn-wrap').find('div').removeClass('active')
-
-        getPreviousResults(10, roundId)
        showCountDown(userComeinTime, drawStageStartTime, showResultStageStartTime)
        judgeStatus()
        getUserInfo()
-
        // 播放5s動畫
        let player = new SVGA.Player('.wait-time');
        let parser = new SVGA.Parser('.wait-time');
-        parser.load('./images/wait.svga', function (videoItem) {
+        parser.load('./images/wait1.svga', function (videoItem) {
            // player.loops = 2;
            player.clearsAfterStop = false;
            player.setVideoItem(videoItem);
@@ -256,6 +259,7 @@ const showView = () => {
        // 第三階段
        console.log('進入第三階段');
        $('.draw-time').show().siblings().hide()
+        $('.roundId').show()
        $countDown = $('.draw-time .count-down .count-down-num')

        isStatus3 = true //處於第三階段的標識
@@ -264,8 +268,33 @@ const showView = () => {
        showCountDown(userComeinTime, showResultStageStartTime, endTime)
        judgeStatus()
        getUserInfo()
-        // getPreviousResults(10, roundId)
+        // 动画上
+        let player = new SVGA.Player('.wait-time-s');
+        let parser = new SVGA.Parser('.wait-time-s');
+        parser.load('./images/s.svga', function (videoItem) {
+            // player.loops = 2;
+            player.clearsAfterStop = false;
+            player.setVideoItem(videoItem);
+            player.startAnimation();
+        })
+        // 动画下
+        let player2 = new SVGA.Player('.wait-time-x');
+        let parser2 = new SVGA.Parser('.wait-time-x');
+        parser2.load('./images/x.svga', function (videoItem) {
+            // player.loops = 2;
+            player2.clearsAfterStop = false;
+            player2.setVideoItem(videoItem);
+            player2.startAnimation();
+        })
+        if (drawItemList.length > 1) {
+            $('.wait-time-s').show();
+            $('.wait-time-x').show();
+        } else {
+            $('.wait-time-s').hide();
+            $('.wait-time-x').hide();
+        }
    }
+    $('.game-area').show();
 }

 // 顯示倒計時
@@ -397,7 +426,7 @@ const judgeStatus = () => {
                    drawInfo = res.data
                    img = res.data.drawImageUrl
                    if (isStatus3) {
-                        getPreviousResults(10, roundId)
+                        getPreviousResults(20, roundId)
                    }
                    renderDrawInfo()
                } else {
@@ -421,8 +450,40 @@ const judgeStatus = () => {
 let topThreeArr = []
 const renderDrawInfo = () => {
    $('.draw-time .current-tip .current-result').html(drawInfo.drawName)
-    $('.draw-pic img').attr('src', drawInfo.drawImageUrl)
-
+    // $('.draw-pic img').attr('src', drawInfo.drawImageUrl)
+    $('.wrap .game-area .draw-time .draw-pic').remove();
+    var lenght = drawInfo.drawItemList.length;
+    var drawStr = '';
+    drawInfo.drawItemList.forEach(res => {
+        drawStr += `
+        <div class="draw-pic">
+            <img src="${res.drawImageUrl}" alt="">
+        </div>
+        `
+    })
+    $('.wrap .game-area .draw-time').append(drawStr);
+    if (lenght == 1) {
+        $('.wrap .game-area .draw-time').css({ "width": "55%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "50%", "height": "100%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "45%" });
+    } else if (lenght == 2) {
+        $('.wrap .game-area .draw-time').css({ "width": "55%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "50%", "height": "100%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "45%" });
+    } else if (lenght == 3) {
+        $('.wrap .game-area .draw-time').css({ "width": "70%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "33.3333%", "height": "75%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "40%" });
+    } else if (lenght == 4) {
+        $('.wrap .game-area .draw-time').css({ "width": "80%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "25%", "height": "65%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "38%" });
+    } else if (lenght > 4) {
+        $('.wrap .game-area .draw-time').css({ "width": "55%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "1.3466666667rem", "height": "1.3466666667rem", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "0.8rem" });
+    }
+    // if()
    // if (isStatus3) {
    //     if (drawInfo.userDrawResult.drawStatus === 1) {
    //         $('.award-info .desc').html('恭喜你，猜中了！')
@@ -480,8 +541,8 @@ const renderDrawInfo = () => {
        topThreeArr.map((item, index) => {
            $(`.top-three-list .no${index + 1} .tx`).attr('uid', item.uid)
            $(`.top-three-list .no${index + 1} .tx`).attr('src', item.avatar)
-            $(`.top-three-list .no${index + 1} .nick`).html(item.nick)
-            $(`.top-three-list .no${index + 1} .num span`).html(item.prizeDiamonds)
+            $(`.top-three-list .no${index + 1} .nick`).text(item.nick)
+            $(`.top-three-list .no${index + 1} .num span`).text(item.prizeDiamonds ? item.prizeDiamonds : '')
        })
    }

@@ -567,7 +628,6 @@ const renderListItem = () => {
 }

 // 獲取往輪遊戲結果 
-let previousResults = []
 const getPreviousResults = (count, roundId) => {
    networkRequest({
        type: 'GET',
@@ -578,8 +638,8 @@ const getPreviousResults = (count, roundId) => {
        },
        success (res) {
            if (res.code === 200) {
-                previousResults = res.data
-                renderPreviousResults()
+                // previousResults = res.data
+                renderPreviousResults(res.data)
            }
        },
        error (err) {
@@ -589,40 +649,51 @@ const getPreviousResults = (count, roundId) => {
 }

 // 渲染往輪遊戲結果
-const renderPreviousResults = () => {
-
+const renderPreviousResults = (val) => {
    let str = ''
-    if (previousResults.length < 5) {
-        let len = 5 - previousResults.length
+    if (val.length < 5) {
+        let len = 5 - val.length
        let arr = new Array(len).fill(1)
-        previousResults.push(...arr)
+        val.push(...arr)
    }
    if (isStatus3) {
        if (img) {
-            previousResults.pop()
-            previousResults.unshift({
+            val.pop()
+            val.unshift({
                drawImageUrl: img
            })
-            console.log(previousResults);
        }
-
    }
-    previousResults.map((item) => {
+    val.forEach(res => {
        str += `
-            <p><img src="${item.drawImageUrl}" alt=""></p>
+            <li>
+                ${res.drawItemList.map(item => {
+            if (res.drawItemList.length == 1) {
+                return `<p style="width:0.8rem;height:0.8rem"><img  src="${item.drawImageUrl}" alt=""></p>`;
+            } else if (res.drawItemList.length == 2) {
+                return `<p style="width:0.6rem;height:0.6rem"><img  src="${item.drawImageUrl}" alt=""></p>`;
+            } else if (res.drawItemList.length == 3) {
+                return `<p style="width:0.45rem;height:0.45rem"><img  src="${item.drawImageUrl}" alt=""></p>`;
+            } else {
+                return `<p><img style="width:0.3333333333rem;height:0.3333333333rem" src="${item.drawImageUrl}" alt=""></p>`;
+            }
+
+        }).join('')
+            }
+            </li>
        `
    })
-    $('.result-list').html(str)
+    $('.wrap .previous_Round_Result .box ul').html(str)
 }

 // 發送用戶抽獎數量
 const sendUserDrawInfo = (itemId, num, tais) => {
-    showLoading();
+    // showLoading();
    networkRequest({
        type: 'POST',
        url: urlPrefix + '/act/luckySea/draw',
        // contentType: 'application/json',
-        // data: `[ {
+        // data: `[{
        //     "itemId":${itemId},
        //     "num":${num}
        //   }]`,
@@ -645,15 +716,18 @@ const sendUserDrawInfo = (itemId, num, tais) => {
                    })
                hideLoading(layerIndex)
            } else if (31005) {
+                lock = !lock
                toastMsg(res.message)
                hideLoading(layerIndex)
            }
            else {
+                lock = !lock
                toastMsg(res.message)
                hideLoading(layerIndex)
            }
        },
        error (err) {
+            lock = !lock
            toastMsg('網絡錯誤，請退出重進')
            hideLoading(layerIndex)
        }
@@ -762,7 +836,7 @@ const renderMyInfo = () => {
            num = myInfoD.num
        }
        // $('.mine-diamond-num').html('今日獎勵' + num)
-        $('.mine-diamond-num').html(num)
+        $('.mine-diamond-num').html(num == 0 ? '—— ——' : num)
    } else {
        let erbanNo = myInfoN.erbanNo
        let myIndex = rankListN.findIndex((item, index) => {
@@ -780,7 +854,7 @@ const renderMyInfo = () => {
            myInfoN.nick = '未知'
        }
        $('.mine-info').find('.mine-nick').html(myInfoN.nick)
-        $('.mine-diamond-num').html('猜中' + myInfoN.num + '次')
+        $('.mine-diamond-num').html('猜中<b> ' + myInfoN.num + ' </b>次')
    }
 }

@@ -896,7 +970,7 @@ const renderRankList = () => {
        othersArr.map((item, index) => {
            let num
            if (item.erbanNo) {
-                num = '猜中' + item.num + '次'
+                num = '猜中<b> ' + item.num + ' </b>次'
            }
            others += `
                <li uid="${item.uid}">
@@ -964,7 +1038,8 @@ $(function () {
                }
            }
        })
-    }, 50)
+        // getPreviousResults(20, roundId)
+    }, 100)

    // 監聽按鈕點擊事件
    // let fragmentNum
--- a/view/peko/activity/act-ocean/js/record.js
+++ b/view/peko/activity/act-ocean/js/record.js
@@ -1,12 +1,12 @@
 let urlPrefix = getUrlPrefix()
 let browser = checkVersion()
 // 获取用户的游戏记录
-let recordList = []
+// let recordList = []
 let page = 1
 let pageSize = 10
 let canNext = true;

-
+let lisIndexId = 0;
 var lisIndex = 0;
 const toastMsg = (content = '', time = 2) => {
    layer.open({
@@ -23,7 +23,7 @@ $(function () {
        getUserRecord()
    }, 100)

-    function getUserRecord() {
+    function getUserRecord () {
        canNext = false
        networkRequest({
            type: 'GET',
@@ -32,22 +32,24 @@ $(function () {
                page,
                pageSize
            },
-            success(res) {
+            success (res) {
                if (res.code === 200) {
                    if (res.data.length != 0) {
                        // 能够继续请求下一页
                        canNext = true
+                        // recordList.push(...res.data)
+                        renderRecord(res.data)
                    } else {
                        canNext = false
+                        toastMsg('沒有更多啦~')
                    }
-                    recordList.push(...res.data)
-                    renderRecord(recordList)
+
                } else {
                    canNext = true
                    toastMsg(res.message)
                }
            },
-            error(err) {
+            error (err) {
                canNext = true
                toastMsg('網絡錯誤，請退出重進')
            }
@@ -58,16 +60,16 @@ $(function () {
    const renderRecord = (recordList) => {
        if (recordList.length === 0) {
            $('.record-list').hide();
-            $('.img').show();
+            // $('.img').show();
        } else {
-            $('.record-list li').remove();
+            // $('.record-list li').remove();
            $('.record-list').show();
            $('.img').hide();
            console.log(recordList, 'recordList')
            var drawId;
            var itemUrl;
            var results = [];
-            let lisIndexId = 0;
+

            let str = '';
            recordList.forEach((res, index) => {
@@ -84,45 +86,48 @@ $(function () {
                <li style="margin-bottom: 0.8rem;">
                    <h3>${dateFormat(res.drawTime, 'yy-MM-dd hh:mm:ss')}</h3>
                    <div class="goldBox">
+                        <span>NO.${res.roundId}</span>
                        <p style="display: ${res.drawStatus == 1 ? 'none' : 'block'};" class="fasle">哎呀~猜錯了 o(╥﹏╥)o</p>
                        <p style="display: ${res.drawStatus == 1 ? 'block' : 'none'};" class="true">厲害~猜對了 ୧(๑•̀◡•́๑)૭</p>
                    </div>
                    <div class="result-wrap">
                        <div class="result">
-                            <span>本輪結果</span>
-                            <div class="bg"><img src="${itemUrl}" alt=""></div>
+                            <span></span>
                        </div>
                        <div class="award">
                            <p>獎勵:</p>
                            <img src="./images/diamond.png" class="diamond" alt="">
                            <b>${res.reward}</b>
                        </div>
+                        <div class="result_sBox">
+                            ${res.drawItemList.map(item => {
+                    return `<div class="bg"><img src="${item.drawImageUrl}" alt=""></div>`
+                }).join('')}
+                        </div>
                    </div>
                    <div class="put-wrap">
-                        <div class="put">投入</div>
+                        <div class="put"></div>
                        <div class="list">

                        </div>
                    </div>
                </li>
-                `
-
+    `
            })
            $('.record-list').append(str)


            results.forEach((res, index) => {
                res.forEach(val => {
-
                    $('.record-list li').eq(lisIndexId).find('.list').append(`
-                    <div class="item">
+                    <div class= "item">
                        <p><img src="${val.itemUrl}" class="gift" alt=""></p>
                        <div>
                            <img src="./images/diamond.png" class="diamond" alt="">
                            <span class="in">${val.costPiece}</span>
                        </div>
                    </div>
-                    `)
+    `)
                })
                lisIndex = lisIndex + 1;
                lisIndexId = lisIndexId + 1;
@@ -132,17 +137,16 @@ $(function () {

    }

+    $(window).scroll(function () {
+        if ($(window).scrollTop() + $(window).height() > $(document).height() - 10) {
+            // 请求下一页
+            if (canNext) {
+                page++
+                getUserRecord()
+            } else {
+                console.log('无数据被锁定');
+            }
+        }
+    });

 })
-
-$(window).scroll(function () {
-    if ($(window).scrollTop() + $(window).height() > $(document).height() - 10) {
-        // 请求下一页
-        if (canNext) {
-            page++
-            getUserRecord()
-        } else {
-            console.log('无数据被锁定');
-        }
-    }
-});
--- a/view/peko/activity/act-ocean/record.html
+++ b/view/peko/activity/act-ocean/record.html
@@ -14,32 +14,122 @@
 <body>
    <ul class="record-list">
        <!-- <li style="margin-bottom: 0.8rem;">
-            <h3>${dateFormat(res.drawTime, 'yy-MM-dd hh:mm:ss')}</h3>
+            <h3>23-02-25 19:13:24</h3>
            <div class="goldBox">
-                <p class="true">厲害~猜對了 ୧(๑•̀◡•́๑)૭</p>
-                <p class="fasle">哎呀~猜錯了 o(╥﹏╥)o</p>
+                <span>NO.230225191242</span>
+                <p style="display: block;" class="fasle">哎呀~猜錯了 o(╥﹏╥)o</p>
+                <p style="display: none;" class="true">厲害~猜對了 ୧(๑•̀◡•́๑)૭</p>
            </div>
-            <div class="marine_organism"></div>
            <div class="result-wrap">
                <div class="result">
-                    <span>本輪結果</span>
-                    <div class="bg"><img src="" alt=""></div>
+                    <span></span>
                </div>
                <div class="award">
                    <p>獎勵:</p>
                    <img src="./images/diamond.png" class="diamond" alt="">
-                    <b></b>
+                    <b>0</b>
+                </div>
+                <div class="result_sBox">
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
+                    <div class="bg">
+                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                    </div>
                </div>
            </div>
            <div class="put-wrap">
-                <div class="put">投入</div>
+                <div class="put"></div>
                <div class="list">
                    <div class="item">
-                        <p><img src="" class="gift" alt=""></p>
-                        <img src="./images/diamond.png" class="diamond" alt="">
-                        <span class="in"></span>
+                        <p><img src="http://beta.img.pekolive.com/FmLQyTfMaHlwkvj568vpV0uk7aSc?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">100</span>
+                        </div>
                    </div>

+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/Fm94cJfxF1Eqm0U04nG476JvFLaF?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">0</span>
+                        </div>
+                    </div>
+
+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">100</span>
+                        </div>
+                    </div>
+
+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/Ftlck3geTvQvvjBkyCwxuv7tHR_a?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">100</span>
+                        </div>
+                    </div>
+
+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/Fnnd7i5L8BPI95DF_ZvhdGkk8cqI?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">0</span>
+                        </div>
+                    </div>
+
+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/FoIKvxfBJiUUGNcL8ouKQKENQ2eb?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">100</span>
+                        </div>
+                    </div>
+
+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/Fv3U6kNuCovsRljPb_an73W0U0lZ?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">100</span>
+                        </div>
+                    </div>
+
+                    <div class="item">
+                        <p><img src="http://beta.img.pekolive.com/FuEuGPGHcyGExK_nJhvx08S4KeJ9?imageslim" class="gift"
+                                alt=""></p>
+                        <div>
+                            <img src="./images/diamond.png" class="diamond" alt="">
+                            <span class="in">100</span>
+                        </div>
+                    </div>
                </div>
            </div>
        </li> -->
--- a/view/peko/activity/explore/css/index.css
+++ b/view/peko/activity/explore/css/index.css
@@ -120,6 +120,7 @@ body {
 }
 .mine .avatar img {
  width: 100%;
+  height: 100%;
  border-radius: 50%;
 }
 .mine .info-wrap {
--- a/view/peko/activity/explore/css/index.scss
+++ b/view/peko/activity/explore/css/index.scss
@@ -152,6 +152,7 @@ body {

        img {
            width: 100%;
+            height: 100%;
            border-radius: 50%;
        }
    }
--- a/view/peko/common/js/common2.js
+++ b/view/peko/common/js/common2.js
@@ -541,8 +541,8 @@ function getInfoFromClient () {

    } else {
        // 非app环境调试参数
-        pubInfo.uid = 1407;
-        pubInfo.ticket = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjoxNDA3LCJ0aWNrZXRfaWQiOiIyYmNmNzYwZC05ZjQyLTQ1MWItYjE5Ny0yYzBmNjg1ZjA0NTIiLCJleHAiOjM2MDAsImNsaWVudF9pZCI6ImVyYmFuLWNsaWVudCJ9.gTbpYUZl65KkoDxhSjC8OPkfroXQk4mgb_C-fnVSYN4";
+        pubInfo.uid = 0;
+        pubInfo.ticket = "";
        // pubInfo.uid = "";
        // pubInfo.ticket = "";

--- a/view/peko/modules/myincome/index.html
+++ b/view/peko/modules/myincome/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>peko</title><link href=./static/css/app.bd5e7f6f3013d3bb76f444e34bf50f1e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.ff90bd02ecb0d2060419.js></script><script type=text/javascript src=./static/js/vendor.e1f3b20580f807878b61.js></script><script type=text/javascript src=./static/js/app.861748a1f83bae0fde49.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>peko</title><link href=./static/css/app.12cc56eedab054a8f9ca049e8cc508db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.73ba128795dda6b5ae01.js></script><script type=text/javascript src=./static/js/vendor.e1f3b20580f807878b61.js></script><script type=text/javascript src=./static/js/app.861748a1f83bae0fde49.js></script></body></html>
--- a/view/peko/modules/myincome/static/css/app.12cc56eedab054a8f9ca049e8cc508db.css
+++ b/view/peko/modules/myincome/static/css/app.12cc56eedab054a8f9ca049e8cc508db.css
--- a/view/peko/modules/myincome/static/js/5.9f1b61c9df5c060925e3.js
+++ b/view/peko/modules/myincome/static/js/5.9f1b61c9df5c060925e3.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dragon	b66051c24a	修改sdk，修复隐私曾策	2023-03-15 15:22:21 +08:00
Dragon	7eefa8c5d7	厨房：新增动效	2023-03-10 11:38:51 +08:00
Dragon	5a3f71dbe8	厨房：更改规则	2023-03-09 17:50:35 +08:00
Dragon	26004af207	厨房：替换规则	2023-03-09 17:50:32 +08:00
Dragon	592d5da683	厨房：调整榜单间距	2023-03-09 17:50:29 +08:00
Dragon	642c383576	厨房：修复今日排名溢出问题	2023-03-09 17:50:27 +08:00
Dragon	141a589b69	厨房：修复苹果老手机加载异常	2023-03-09 17:50:24 +08:00
Dragon	edc6375e11	厨房：修复进入闪烁第三阶段问题，修复钻石异常问题，修复名字重叠问题	2023-03-09 17:50:22 +08:00
Dragon	c12b08e3f8	厨房：完成所有接口联调，提测	2023-03-09 17:50:20 +08:00
Dragon	0a4ff7e83c	修改sdk	2023-03-09 17:49:26 +08:00
qf	4c8e0c6a9a	星级厨房：撤销cdn	2023-02-23 12:00:45 +08:00
qf	865c5496cf	寻海之旅用户头像变形修复	2023-02-23 12:00:45 +08:00
Dragon	54dc906e35	厨房：解决下厨不成功后，无法再次下单问题	2023-02-23 12:00:45 +08:00
qf	9398b10240	房间榜单：全局背景修改	2023-02-22 18:26:04 +08:00
qf	e73df1d25a	房间榜单：前三昵称不换行显示	2023-02-22 18:14:50 +08:00
qf	ba5e5a6b77	房间榜单：样式细节调整	2023-02-21 15:35:16 +08:00
qf	09985ea05a	房间榜单：增加会话存储加载榜单，样式修改	2023-02-20 18:06:32 +08:00
qf	3ff071780b	新增声海规则	2023-02-15 15:25:05 +08:00
qf	e1f6253807	星级厨房：调整细节样式	2023-02-15 15:10:23 +08:00
qf	3caed7927b	23情人节：自己没有cp时跳转个人主页错误解决	2023-02-10 11:04:21 +08:00
qf	1871830a8c	23情人节：恭喜弹窗名字不展示修改	2023-02-09 18:27:00 +08:00
qf	0347d1d055	23情人节：消耗情签字体修改	2023-02-09 18:05:45 +08:00
qf	3eaa4c2fae	23情人节：替换规则切图	2023-02-09 17:53:37 +08:00
qf	9f946f0837	23情人节：替换规则图片	2023-02-09 15:10:33 +08:00
qf	8afbeb96e8	23情人节：抽靓号渲染图片删除多余prop	2023-02-09 14:27:47 +08:00
qf	5de1125e3c	23情人节：cp弹窗提示修改	2023-02-08 18:54:41 +08:00
qf	724cf39448	23情人节：remain修改	2023-02-08 18:01:03 +08:00
qf	989c70160c	23情人节：购买后值不刷新修改，cp奖励记录弹窗修改	2023-02-08 17:29:35 +08:00
qf	6452505805	2023情人节：样式调整	2023-02-08 14:55:54 +08:00
qf	a259af6c6a	23情人节：自己排名、购买成功礼物样式，替换图片	2023-02-07 16:28:05 +08:00
qf	8729fc7f5b	23情人节：购买接口增加未中奖提示	2023-02-06 18:46:18 +08:00
qf	82dc3faf62	23情人节：cp列表渲染修改	2023-02-06 14:55:52 +08:00
qf	f238bb7555	23情人节：缔结按钮不可点击修改，换图	2023-02-06 14:47:29 +08:00
qf	bcdd71940b	2023情人节：购买后刷新，修改我的cp样式	2023-02-06 11:28:16 +08:00
qf	8961247913	23情人节：增加礼物轮播，修改文案	2023-02-05 22:29:53 +08:00
qf	8f1f3ffd05	2023情人节：抽奖记录请求参数修改	2023-02-03 18:42:12 +08:00
qf	88338517c4	新增2023情人节活动	2023-02-02 18:36:38 +08:00
qf	e3a6e343bd	小精灵：成功找到钻石字段修改	2023-01-16 16:55:00 +08:00
qf	bb9ad461b0	小精灵：请求失败关闭动效	2023-01-11 17:46:35 +08:00
qf	303c60e445	小精灵：动效改为播放一秒后请求	2023-01-11 17:44:19 +08:00
qf	39469b924d	小精灵：取消cdn加载	2023-01-11 17:19:42 +08:00
qf	24b3a8ca5e	小精灵：动效改为本地加载	2023-01-11 16:08:57 +08:00
qf	30709845dd	小精灵：清缓存	2023-01-11 15:28:39 +08:00
qf	b88da33b28	小精灵：cdn获取图片	2023-01-11 11:48:35 +08:00
qf	1f638070cc	小精灵：关闭小精灵弹窗修改请求状态字段,记录请求增加loading	2023-01-10 16:14:35 +08:00
qf	edfeb646f6	修改结果弹窗礼物名称字段，中奖记录弹窗初始化	2023-01-10 15:40:07 +08:00
qf	ab175d9390	小精灵优化，钻石收入增加小精灵奖励	2023-01-10 11:58:13 +08:00
qf	e4faf289a9	星级厨房：切换图片域名	2022-12-30 17:59:13 +08:00
qf	f1871efd20	星级厨房：图片动效资源改为cdn获取	2022-12-29 11:52:54 +08:00
qf	3f18ee1b3b	星级厨房：增加轮次，游戏记录优化，替换规则图片	2022-12-28 15:09:16 +08:00
qf	dc18fe1855	房间榜单：长头像变形修复	2022-12-28 15:09:16 +08:00