ios修改星级厨房、小精灵、寻爱之旅充值入口方法名

view/peko/activity/act-2022-qx/js/index.js

@@ -6,7 +6,7 @@ if (env == 'test') {
 }
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -110,8 +110,8 @@ var arrInfoGift = [
 var rewardGit = [
     { name: '', type: 1, day: "1天", img: '' },//type 1:头饰,2:礼物
     { name: '', type: 1, day: "3天", img: '' },
-    { name: '星星瓶', type: 2, day: "99钻石", img: './images/g3.png' },
-    { name: '告白情书', type: 2, day: "666钻石", img: './images/g4.png' },
+    { name: '星星瓶', type: 2, day: "99鉆石", img: './images/g3.png' },
+    { name: '告白情书', type: 2, day: "666鉆石", img: './images/g4.png' },
 ]
 
 $(function () {
@@ -335,7 +335,7 @@ function listRank (rankType) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -401,7 +401,7 @@ function listMyRankFun (rankType) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -458,7 +458,7 @@ function getRecommendRoom () {
                     },
                     error (err) {
                         hideLoading(layerIndex)
-                        toastMsg('网络错误，请退出重进')
+                        toastMsg('網絡錯誤，請退出重進')
                     }
                 })
                 hideLoading(layerIndex)
@@ -469,7 +469,7 @@ function getRecommendRoom () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -521,7 +521,7 @@ function sendBulletChatFun (content) {
                     },
                     error (err) {
                         hideLoading(layerIndex)
-                        toastMsg('网络错误，请退出重进')
+                        toastMsg('網絡錯誤，請退出重進')
                     }
                 })
             } else {
@@ -531,7 +531,7 @@ function sendBulletChatFun (content) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -560,7 +560,7 @@ function getMyBulletChat () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 
@@ -615,7 +615,7 @@ function getPageInfo () {
                         }
                     },
                     error () {
-                        toastMsg('网络错误')
+                        toastMsg('網絡錯誤')
                     }
                 })
                 res.data.tasks.forEach((res, index) => {
@@ -665,7 +665,7 @@ function getPageInfo () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -695,7 +695,7 @@ function chargeFun (batteryNum) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
             chargeFunType = !chargeFunType;
         }
     })

view/peko/activity/act-520/js/index.js

@@ -3,7 +3,7 @@ let browser = checkVersion()
 if (EnvCheck() === 'test') new VConsole
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
   layer.open({
     type: 2,
     shadeClose: false,
@@ -48,7 +48,7 @@ const getList = (rankType = 1, rankDataType = 0) => {
       }
     },
     error(err) {
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }

view/peko/activity/act-61/js/index.js

@@ -2,13 +2,13 @@
 var api = locateJudge();
 var browser = checkVersion();
 var info = {};
-var betaUrl = 'https://yeying.api.shengxuanwangluo.com/peko/activity/act-61/index.html';
+var betaUrl = 'https://beta.api.pekolive.com/peko/activity/act-61/index.html';
 var realUrl = tranUrl + '/peko/activity/act-61/index.html';
 var share = {
   title: '纯真年代',
   link: tranUrl + '/peko/activity/act-61/index.html',
   // imgUrl: 'https://img.letusmix.com/new_logo.png',
-  imgUrl: 'https://yeying.api.shengxuanwangluo.com/peko/modules/wxPubPay/images/logo.png',
+  imgUrl: 'https://api.pekolive.com/peko/modules/wxPubPay/images/logo.png',
   desc: '限定铭牌萌趣降临',// 分享描述
 };
 if (EnvCheck() == 'test') {

view/peko/activity/act-car/js/index.js

@@ -28,7 +28,7 @@ $(function () {
 
     $.ajax({
       type: 'get',
-      // url: 'https://yeying.api.shengxuanwangluo.com/carActivity/user',
+      // url: 'https://beta.api.pekolive.com/carActivity/user',
       url: '/carActivity/user',
       headers: {
         pub_uid: info.uid,

view/peko/activity/act-celebration/js/wish.js

@@ -2,7 +2,7 @@ const urlPrefix = getUrlPrefix()
 if(EnvCheck() === 'test') new VConsole
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -41,7 +41,7 @@ const getInitInfo = () => {
             }
         },
         error(err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -76,7 +76,7 @@ const getUserActInfo = () => {
             }
         },
         error(err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -123,7 +123,7 @@ const wishDraw = (keyNum) => {
             }
         },
         error(err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -183,7 +183,7 @@ const getRecordList = (page = 1) => {
             isLock = true
         },
         error(err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -315,7 +315,7 @@ $(function(){
                     }
                 },
                 error(err) {
-                    toastMsg('网络错误')
+                    toastMsg('網絡錯誤')
                 }
             })
         }

view/peko/activity/act-celebration/wish.html

@@ -42,7 +42,7 @@
                     <span>青铜</span>
                     <span>白银</span>
                     <span>黄金</span>
-                    <span>钻石</span>
+                    <span>鉆石</span>
                 </div>
                 <div class="distance">
                     距离 <span></span> 还需 <span></span> 狂欢值
@@ -50,7 +50,7 @@
             </div>
             <div class="rule_wrap">
                 <p class="rule_item">
-                    全平台任何用户送出礼物都可使全民狂欢值增加（每1钻石的礼物=狂欢值+1），当狂欢值每次达到任何一个阶梯时，所有用户将获赠一个魔法棒
+                    全平台任何用户送出礼物都可使全民狂欢值增加（每1鉆石的礼物=狂欢值+1），当狂欢值每次达到任何一个阶梯时，所有用户将获赠一个魔法棒
                 </p>
                 <p class="rule_item">
                     狂欢值将在每日00:00重新开始计算，所有用户每天都可获得新的魔法棒
@@ -76,7 +76,7 @@
         <div class="tab2_contain">
             <div class="rule_wrap">
                 <p class="rule_item">
-                    活动期间，每日登录夜莺App即可免费获赠一个魔法棒（每台设备每日限一次）
+                    活动期间，每日登录pekoApp即可免费获赠一个魔法棒（每台设备每日限一次）
                 </p>
             </div>
             <div class="panel_wrap">
@@ -94,7 +94,7 @@
         <div class="tab3_contain">
             <div class="rule_wrap">
                 <p class="rule_item">
-                    活动期间，每送出价值200钻的任意礼物即可获赠1个魔法棒，不设上限
+                    活动期间，每送出价值200鉆的任意礼物即可获赠1个魔法棒，不设上限
                 </p>
             </div>
             <div class="panel_wrap">

view/peko/activity/act-fortune-list/js/index.js

@@ -4,7 +4,7 @@ var rankDataType = 1;
 var rankType = 1;
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -83,7 +83,7 @@ function getData (rankDataType, rankType) {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }

view/peko/activity/act-guard-planet/index.html

@@ -71,7 +71,7 @@
                 <div class="decrement-ten"><img src="./images/main/decrement-ten.png" alt=""></div>
                 <div class="ipt-wrap">
                     <span>召唤个数</span>
-                    <p>成功击败怪兽将获得<i>0</i>钻石奖励</p>
+                    <p>成功击败怪兽将获得<i>0</i>鉆石奖励</p>
                     <!-- <main>消耗魔法石<i>0</i></main> -->
                     <main>召唤个数</main>
                     <img src="./images/main/decrement.png" alt="" class="decrement">
@@ -145,7 +145,7 @@
                 <img src="" alt="" class="result-monster-pic">
                 <div class="result-weapon-name"></div>
                 <div class="result-monster-name"></div>
-                <div class="result-award">获得<span></span>钻石奖励</div>
+                <div class="result-award">获得<span></span>鉆石奖励</div>
                 <div class="top-three">
                     <img src="" alt="">
                     <img src="" alt="">
@@ -166,7 +166,7 @@
                     <span></span>
                     <p class="buy-btn"><img src="./images/popup/buy-btn.png" alt=""></p>
                 </div>
-                <div class="diamond-num">我的钻石<span>0</span></div>
+                <div class="diamond-num">我的鉆石<span>0</span></div>
             </div>
         </div>
 
@@ -194,7 +194,7 @@
                     <div class="decrement-ten"><img src="./images/popup/decrement-ten.png" alt=""></div>
                     <div class="ipt-wrap">
                         <span>召唤个数</span>
-                        <p>成功击败怪兽将获得<i>0</i>钻石奖励</p>
+                        <p>成功击败怪兽将获得<i>0</i>鉆石奖励</p>
                         <main>消耗魔法石<i>0</i></main>
                         <img src="./images/main/decrement.png" alt="" class="decrement">
                         <input type="text" value="0">

view/peko/activity/act-guard-planet/js/index.js

@@ -27,7 +27,7 @@ console.log($(window).height());
 
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -75,14 +75,14 @@ const getListPack = () => {
             }
         },
         error (err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
 
 // 获取用户相关信息
 let myFragment //道具数量
-let userDiamonds //钻石数量
+let userDiamonds //鉆石数量
 const getUserInfo = (param) => {
     networkRequest({
         type: 'GET',
@@ -107,7 +107,7 @@ const getUserInfo = (param) => {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -171,7 +171,7 @@ const getNewestAct = () => {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -478,7 +478,7 @@ const judgeStatus = () => {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -501,7 +501,7 @@ const getListItem = (roundId) => {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -657,7 +657,7 @@ const sendUserDrawInfo = (itemId, num) => {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -693,7 +693,7 @@ const getUserRecord = () => {
             }
         },
         error (err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -793,7 +793,7 @@ const getPreviousResults = (count, roundId) => {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -823,11 +823,11 @@ const renderPreviousResults = () => {
 /**************************************************  守护记录 over  ***************************************************/
 
 /**************************************************  排行榜 start  ***************************************************/
-// 榜单类型，1是钻石榜，2是欧皇榜
+// 榜单类型，1是鉆石榜，2是欧皇榜
 let type = 1
 let pageSizeRank = 30
 
-// 钻石榜单
+// 鉆石榜单
 let pageD = 1
 let myInfoD = []
 let rankListD = []
@@ -856,7 +856,7 @@ const getListRank = (type, page) => {
         success (res) {
             if (res.code === 200) {
                 if (type === 1) {
-                    // 钻石榜单
+                    // 鉆石榜单
                     rankListD.push(...res.data.rankList)
                     myInfoD = res.data.myRankInfo
                     renderMyInfo()
@@ -874,7 +874,7 @@ const getListRank = (type, page) => {
             }
         },
         error (err) {
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -882,7 +882,7 @@ const getListRank = (type, page) => {
 // 渲染底部个人信息
 const renderMyInfo = () => {
     if (type === 1) {
-        // 钻石榜单
+        // 鉆石榜单
         let erbanNo = myInfoD.erbanNo
         let myIndex = rankListD.findIndex((item, index) => {
             return item.erbanNo === erbanNo
@@ -931,7 +931,7 @@ const renderMyInfo = () => {
 // 渲染榜单信息
 const renderRankList = () => {
     if (type === 1) {
-        // 钻石榜单
+        // 鉆石榜单
         // 渲染前3      
         let topThreeArr = rankListD.slice(0, 3)
         if (rankListD.length < 3) {
@@ -1525,7 +1525,7 @@ $(function () {
                 }
             },
             error (err) {
-                toastMsg('网络错误')
+                toastMsg('網絡錯誤')
             }
         })
     })

view/peko/activity/act-guard-planet/js/mall.js

@@ -13,7 +13,7 @@ const showLoading = () => {
     layer.open({
         type: 2,
         shadeClose: false,
-        content: '加载中...',
+        content: '加載中...',
         success(e) {
             layerIndex = $(e).attr('index')
         }
@@ -50,7 +50,7 @@ const getUserInfo = (param) => {
             }
         },
         error(err){
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -68,7 +68,7 @@ const getListPack = () => {
             }
         },
         error(err){
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -220,7 +220,7 @@ $(function(){
                     lock = false
                 },
                 error(err){
-                    toastMsg('网络错误')
+                    toastMsg('網絡錯誤')
                 }
             })
         }

view/peko/activity/act-guard-planet/mall.html

@@ -73,7 +73,7 @@
             </div>
             <div class="diamond-num">
                 <img src="./images/mall/diamond-icon.png" alt="">
-                钻石数量：<span>0</span>
+                鉆石数量：<span>0</span>
             </div>
         </div>
     </div>
@@ -94,7 +94,7 @@
             </div>
             <div class="buy-price">
                 <p>金额：</p>
-                <p><span></span>钻石</p>
+                <p><span></span>鉆石</p>
             </div>
             <div class="buy-confirm-btn">
                 <p class="cancel">取消</p>

view/peko/activity/act-luckyDraw/js/index.js

@@ -7,7 +7,7 @@ const showLoading = () => {
     layer.open({
         type: 2,
         shadeClose: false,
-        content: '加载中...',
+        content: '加載中...',
         success(e){
             layerIndex = $(e).attr('index')
         }
@@ -59,7 +59,7 @@ const getData = () => {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -81,7 +81,7 @@ const getBattery = () => {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -123,7 +123,7 @@ const lightBulb = (num) => {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -253,7 +253,7 @@ const getRecordList = () => {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }

view/peko/activity/act-magicSchool/index.html

@@ -0,0 +1,254 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>魔法学院</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/index.css">
+</head>
+
+<body>
+    <!-- 顶部返回 -->
+    <div class="back"><img src="./images/travel/back.png" alt=""></div>
+    <!-- 头部 -->
+    <div class="hdader">
+        <img src="./images/rule_icon.png" alt="" class="rule_icon">
+    </div>
+    <!-- 显示礼物 -->
+    <div class="limitedGift"></div>
+    <!-- tab -->
+    <div class="tab">
+        <div id="tab1"></div>
+        <div></div>
+        <div></div>
+        <div></div>
+    </div>
+    <div class="page1">
+        <!-- 黑暗森林 -->
+        <div class="darkForest">
+            <!-- 原石 -->
+            <div class="rough">原石: <b></b></div>
+            <!-- 森林照片 -->
+            <img src="./images/amethystStones.png" alt="" class="amethystStones">
+            <!-- 初级动画 -->
+            <div class="csvags">
+                <div class="csvag"></div>
+            </div>
+            <!-- 高级动画 -->
+            <div class="gsvags">
+                <div class="gsvag"></div>
+            </div>
+            <!-- 奖池纪录 -->
+            <img src="./images/prizePoolRecord_icon.png" alt="" class="prizePoolRecord">
+            <!-- 初级探险 -->
+            <div class="primaryBut"></div>
+            <!-- 高级探险 -->
+            <div class="seniorBut">
+                <img src="./images/sc.png" alt="">
+            </div>
+        </div>
+        <!-- 任务 -->
+        <div class="toast">
+            <div class="toast1 to">
+                <p>进入任意房间（<b>0</b>/3）</p>
+                <div class="but"></div>
+            </div>
+            <div class="toast2 to">
+                <p>赠送任意礼物</p>
+                <div class="but"></div>
+            </div>
+            <div class="toast3 to">
+                <p>停留房间30分钟（<b>0</b>/30）</p>
+                <div class="but"></div>
+            </div>
+            <div class="toast4 to">
+                <p>完成每日任务获得原石*1</p>
+                <span>
+                    <b></b>
+                    <i>1/3</i>
+                </span>
+                <div class="but"></div>
+            </div>
+            <div class="toast5 to">
+                <p>每送出魔法礼物200鉆石获得原石*1</p>
+                <div class="but" click='0' room="1"></div>
+            </div>
+        </div>
+    </div>
+    <div class="page2">
+        <!-- 紫晶原石 -->
+        <div class="amethystStone">
+            <!-- 原石名称 -->
+            <img src="./images/amethystStoneText1.png" alt="" class="stoneNick">
+            <!-- amethystStoneGift -->
+            <img src="./images/amethystStone3.png" alt="" class="amethystStoneGift">
+            <div class="amethystStoneGiftSvgas">
+                <div class="ssvag"></div>
+            </div>
+            <!-- 进度条 -->
+            <div class="lineBox">
+                <span></span>
+                <p>水晶石：<b></b></p>
+                <i><strong>0</strong>/<em style="font-style: normal;">700</em></i>
+            </div>
+            <img src="./images/qiehuan.png" alt="" class="left">
+            <img src="./images/qiehuan.png" alt="" class="right">
+            <!-- 试炼1次按钮 -->
+            <img src="./images/amethystStoneBut1.png" alt="" class="amethystStoneBut1">
+            <!-- 试炼5次按钮 -->
+            <img src="./images/amethystStoneBut5.png" alt="" class="amethystStoneBut5">
+            <!-- 试炼完成次按钮 -->
+            <img src="./images/amethystStoneButOut.png" alt="" class="amethystStoneOut">
+        </div>
+        <!-- 魔法石成就墙 -->
+        <div class="amethystStoneList">
+            <img src="./images/wenhao.png" alt="" class="wenhao">
+            <ul>
+                <li>
+                    <img src="./images/logo.png" alt="">
+                    <span>虚以为逮</span>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="page3">
+        <div class="list">
+            <!-- rule -->
+            <div class="rule_list_icon"></div>
+            <!-- tab -->
+            <div class="tabs">
+                <div class="tabAcative">日榜</div>
+                <div>总榜</div>
+            </div>
+            <!-- 时间切换 -->
+            <div class="time">
+                <img src="./images/timeBg.png" alt="" class="timeLeftBg">
+                <b>8月25日</b>
+                <img src="./images/timeBg.png" alt="" class="timeRightBg">
+            </div>
+            <!-- 前三 -->
+            <div class="top top1">
+                <div class="bg"></div>
+                <img src="./images/logo.png" alt="" class="txBg">
+                <div class="nick">最多六个字啊</div>
+                <p>魅力值:12234</p>
+            </div>
+            <div class="top top2">
+                <div class="bg"></div>
+                <img src="./images/logo.png" alt="" class="txBg">
+                <div class="nick">最多六个字啊</div>
+                <p>魅力值:12234</p>
+            </div>
+            <div class="top top3">
+                <div class="bg"></div>
+                <img src="./images/logo.png" alt="" class="txBg">
+                <div class="nick">最多六个字啊</div>
+                <p>魅力值:12234</p>
+            </div>
+            <!-- 非前三 -->
+            <ul class="notTop">
+                <li>
+                    <div class="num">NO.4</div>
+                    <img src="./images/logo.png" alt="">
+                    <div class="nick">用户昵称压压</div>
+                    <div class="score">魅力值:12234</div>
+                </li>
+            </ul>
+        </div>
+        <!-- 自己榜单 -->
+        <div class="myList">
+            <div class="num">未上榜</div>
+            <img src="./images/logo.png" alt="">
+            <div class="nick">用户昵称压压</div>
+            <div class="score">魅力值:12234</div>
+        </div>
+    </div>
+    <!-- 榜单奖励 -->
+    <div class="list_r">
+        <div class="list_r_in">
+            <div class="box">
+                <img src="./images/rule_c.png" alt="">
+            </div>
+        </div>
+    </div>
+    <!-- 森林奖励/记录 -->
+    <div class="forestReward">
+        <div class="forestReward_in">
+            <div class="forestRewardTab">
+                <div class="forestRewardTab1_active"></div>
+                <div class="forestRewardTab2"></div>
+            </div>
+            <div class="forestRewardPage1">
+                <div class="box1">
+                    <div class="active">初级探险</div>
+                    <div>高级探险</div>
+                </div>
+                <img src="./images/forestRewardPage1Bg1.png" alt="" class="forestRewardPage1Bg">
+            </div>
+            <div class="forestRewardPage2">
+                <div class="title">
+                    <div>探险时间</div>
+                    <div>获得奖励</div>
+                </div>
+                <ul>
+                    <li>
+                        <div class="left">
+                            <p>2022/8/23</p>
+                            <b>23:23:56</b>
+                        </div>
+                        <div class="right">
+                            <p>大魔法师铭牌</p>
+                            <b>1天</b>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <!-- 活动规则 -->
+    <div class="rule">
+        <img src="./images/rule.png" alt="">
+    </div>
+    <!-- 查看弹窗 -->
+    <div class="look_put">
+        <div class="look_put_in">
+            <p style="display: none;" class="p1">前十位魔法师完成试炼点亮<br>成就墙可获得</p>
+            <p style="display: none;" class="p2">试炼此水晶原石可获得</p>
+            <img src="./images/logo.png" alt="" class="gift">
+            <img style="display: none;" src="./images/obtained.png" alt="" class="obtained">
+            <span class="giftNick"></span>
+            <span class="num"></span>
+            <div class="but"></div>
+        </div>
+    </div>
+    <!-- 恭喜获得 -->
+    <div class="gx">
+        <div class="gx_in">
+            <div class="gift_bg">
+                <img src="./images/logo.png" alt="">
+            </div>
+            <p class="gift"></p>
+            <b class="num"></b>
+            <div class="but"></div>
+        </div>
+    </div>
+    <!-- 活动结束 -->
+    <div class="actOut">
+        <div class="actOut_in">
+            <div class="but"></div>
+        </div>
+    </div>
+</body>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="../../common/js/svga.min.js"></script>
+<script src="./js/index.js?v=1.3"></script>
+
+</html>

view/peko/activity/act-magicSchool/js/index.js

@@ -0,0 +1,894 @@
+// 封装layer消息提醒框
+let layerIndex
+const showLoading = (content = '加載中...') => {
+    layer.open({
+        type: 2,
+        shadeClose: false,
+        content,
+        success (e) {
+            layerIndex = $(e).attr('index')
+        }
+    })
+}
+const hideLoading = (index) => {
+    layer.close(index)
+}
+const toastMsg = (content = '操作完成', time = 2) => {
+    layer.open({
+        content,
+        time,
+        skin: 'msg'
+    })
+}
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+var startTime;//活动开始时间
+var endTime;//活动结束时间
+var nowTime = new Date().getTime();
+var firstExplorer;//是否首次高级探险
+var roomUid;
+let page = 0;
+let scrollBool = true;
+var passStatus;//水晶通关状态
+var caystalTrialLevel;//水晶当前等级
+var caystalTrialLevelIndex;//水晶当前等级
+var rankType = 0;//默认日榜
+var currentTimes = 1;
+var amethystStoneArr = [
+    {
+        giftNick: './images/amethystStoneText1.png',
+        img: './images/amethystStone3.png',
+        num: 700,
+        value: '3天',
+        awardName: '丛林秘藏',
+        imgs: './images/img1.png'
+    },
+    {
+        giftNick: './images/amethystStoneText2.png',
+        img: './images/amethystStone2.png',
+        num: 1500,
+        value: '3天',
+        awardName: '大魔导师',
+        imgs: './images/img2.png'
+    },
+    {
+        giftNick: './images/amethystStoneText3.png',
+        img: './images/amethystStone1.png',
+        num: 1800,
+        value: '3天',
+        awardName: '独角兽座驾',
+        imgs: './images/img3.png'
+    },
+]
+
+if (env == 'test') {
+    new VConsole();
+}
+var xsSvgaClick = true;
+
+
+$(function () {
+    getInfoFromClient();
+    setTimeout(function () {
+        // 页面全屏
+        if (browser.app) {
+            if (browser.android) {
+                window.androidJsObj.initShowNav(false)
+            } else {
+                window.webkit.messageHandlers.initShowNav.postMessage(0)
+            }
+        };
+        // 顶部返回事件
+        $('.back').click(() => {
+            if (browser.android) {
+                window.androidJsObj.closeWebView()
+            } else {
+                window.webkit.messageHandlers.closeWebView.postMessage(null)
+            }
+        })
+        getPageInfo();
+        getRecommendRoom();
+    }, 100)
+})
+var player1;
+var player2;
+var player3;
+function xsSvgaFun1 () {
+    bodyScroolFun(true);
+    $('.page1 .darkForest .csvags').show();
+    player1 = new SVGA.Player('.csvag');
+    parser1 = new SVGA.Parser('.csvag');
+    console.log(parser1);
+    parser1.load('./images/csvag.svga', function (videoItem) {
+        player1.loops = 1;
+        player1.clearsAfterStop = false;
+        player1.setVideoItem(videoItem);
+        player1.startAnimation();
+        player1.setContentMode('AspectFill')
+        player1.onFinished(() => {
+            $('.page1 .darkForest .csvags').hide();
+            bodyScroolFun(false);
+        })
+    })
+
+}
+function xsSvgaFun2 () {
+    bodyScroolFun(true);
+    $('.page1 .darkForest .gsvags').show();
+    player1 = new SVGA.Player('.gsvag');
+    parser1 = new SVGA.Parser('.gsvag');
+    parser1.load('./images/gscag.svga', function (videoItem) {
+        player1.loops = 1;
+        player1.clearsAfterStop = false;
+        player1.setVideoItem(videoItem);
+        player1.startAnimation();
+        player1.setContentMode('AspectFill')
+        player1.onFinished(() => {
+            bodyScroolFun(false);
+            $('.page1 .darkForest .gsvags').hide();
+        })
+    })
+
+}
+function xsSvgaFun3 () {
+    bodyScroolFun(true);
+    $('.page2 .amethystStone .amethystStoneGiftSvgas').show();
+    player1 = new SVGA.Player('.ssvag');
+    parser1 = new SVGA.Parser('.ssvag');
+    parser1.load('./images/ssvag.svga', function (videoItem) {
+        player1.loops = 1;
+        player1.clearsAfterStop = false;
+        player1.setVideoItem(videoItem);
+        player1.startAnimation();
+        player1.setContentMode('AspectFill')
+        player1.onFinished(() => {
+            bodyScroolFun(false);
+            $('.page2 .amethystStone .amethystStoneGiftSvgas').hide();
+        })
+    })
+}
+// 获取魔法师成就墙接口
+function getMagicList () {
+    $('.page2 .amethystStoneList ul li').remove();
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/activity/magic/magicList',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid },
+        success (res) {
+            if (res.code === 200) {
+                var str = '';
+                res.data.forEach((res => {
+                    str += `
+                        <li>
+                            <img src=${res.avatar}" alt="">
+                            <span>${res.nick.length > 4 ? res.nick.slice(0, 4) + '...' : res.nick}</span>
+                        </li>
+                    `
+                }))
+                $('.page2 .amethystStoneList ul').append(str)
+                hideLoading(layerIndex)
+            } else {
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 获取房间接口
+function getRecommendRoom () {
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/act/cp/2022/getRecommendRoom',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid },
+        success (res) {
+            if (res.code === 200) {
+                roomUid = res.data;
+                hideLoading(layerIndex)
+            } else {
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 初始化
+function getPageInfo () {
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/activity/magic/info',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid },
+        success (res) {
+            if (res.code === 200) {
+                startTime = res.data.startTime;
+                endTime = res.data.endTime;
+                console.log(dateFormat(startTime, "MM月dd日"));
+                console.log(dateFormat(endTime, "MM月dd日"));
+                $('.page3 .list .time b').attr('time', nowTime);
+                $('.page3 .list .time b').text(dateFormat(nowTime, "MM月dd日"));
+                if (nowTime > endTime) {
+                    $('.page3 .list .time b').attr('time', endTime);
+                    $('.page3 .list .time b').text(dateFormat(endTime, "MM月dd日"));
+                    console.log(sessionStorage.getItem('bool'));
+                    if (sessionStorage.getItem('bool') != "true") {
+                        $('.actOut').show();
+                        bodyScroolFun(true);
+                    }
+                }
+                firstExplorer = res.data.firstExplorer
+                if (firstExplorer) {
+                    $('.page1 .darkForest .seniorBut img').hide();
+                } else {
+                    $('.page1 .darkForest .seniorBut img').show();
+                }
+                $('.page1 .darkForest .rough b').text(res.data.stoneNum);
+                var nums = 0;
+                res.data.taskList.forEach((res, index) => {
+                    $(`.page1 .toast .toast${index + 1} p b`).text(res.num != undefined ? res.num : '');
+                    if (res.taskStatus == 2) {
+                        nums = nums + 33.33333333333333;
+                    }
+                    if (index + 1 == 3) {
+                        $(`.page1 .toast .toast${index + 1} p b`).text(res.taskStatus == 2 ? 30 : 0);
+                    }
+
+                    if (res.taskStatus == 1) {
+                        $(`.page1 .toast .toast${index + 1} div`).attr('click', 0);
+                        if (index + 1 < 4) {
+                            $(`.page1 .toast .toast${index + 1} div`).addClass('but');
+                        } else {
+                            $(`.page1 .toast .toast${index + 1} div`).addClass('toast_ing');
+                        }
+                    } else {
+                        $(`.page1 .toast .toast${index + 1} div`).attr('click', 1);
+                        if (index + 1 > 4) {
+                            $(`.page1 .toast .toast${index + 1} div`).addClass('toast_out');
+                        } else {
+                            $(`.page1 .toast .toast${index + 1} div`).addClass('toast_out');
+                        }
+                    }
+                    if (index + 1 == 1 || index + 1 == 3) {
+                        $(`.page1 .toast .toast${index + 1} div`).attr('room', 1);
+                    } else {
+                        $(`.page1 .toast .toast${index + 1} div`).attr('room', 0);
+                    }
+                    if (index + 1 == 4) {
+                        $(`.page1 .toast .toast4 span i`).text(`（${res.num}/3）`);
+                        if (res.taskStatus == 2) {
+                            $(`.page1 .toast .toast${index + 1} span b`).css('width', '100%')
+                        } else {
+                            $(`.page1 .toast .toast${index + 1} span b`).css('width', `${nums}%`)
+                        }
+                    }
+                    hideLoading(layerIndex)
+                })
+            } else {
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 查看榜单按钮
+$('.actOut .actOut_in .but').click(function () {
+    sessionStorage.setItem("bool", 'true');
+    bodyScroolFun(false);
+    $('.page1').hide();
+    $('.page2').hide();
+    $('.tab div:nth-child(3)').attr('id', 'tab3');
+    $('.tab div:nth-child(1)').attr('id', '');
+    currentTimes = 1;
+    getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+    $('.page3 .list').removeClass('list2');
+    $('.page3').show();
+    $('.actOut').hide();
+})
+// 探险记录接口
+function getExplorerRecord (page) {
+    scrollBool = false;
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/activity/magic/explorerRecord',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid, page, pageSize: 10 },
+        success (res) {
+            if (res.code === 200) {
+                scrollBool = true;
+                var str = ``;
+                if (res.data.length == 0) {
+                    scrollBool = false;
+                } else {
+
+                    res.data.forEach((res, index) => {
+                        str += `
+                        <li>
+                            <div class="left">
+                                <p>${dateFormat(res.createTime, 'yyyy/MM/dd')}</p>
+                                <b>${dateFormat(res.createTime, 'hh:mm:ss')}</b>
+                            </div>
+                            <div class="right">
+                                <p>${res.objDes}</p>
+                                <b></b>
+                            </div>
+                        </li>
+                    `
+                    })
+                }
+                $('.forestReward .forestReward_in .forestRewardPage2 ul').append(str);
+                console.log(page);
+                hideLoading(layerIndex)
+            } else {
+                scrollBool = true;
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            scrollBool = true;
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 探险接口
+function getExplorer (explorerType) {
+    showLoading()
+    networkRequest({
+        type: 'post',
+        url: urlPrefix + '/activity/magic/explorer',
+        data: { explorerType, pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid, },
+        success (res) {
+            if (res.code === 200) {
+                $('.gx .gx_in .gift').text(res.data.awardName);
+                $('.gx .gx_in .gift_bg img').removeClass('img1');
+                if (res.data.awardType == 3 || res.data.awardType == 1 || res.data.awardType == 2) {
+                    if (res.data.awardType == 1) {
+                        $('.gx .gx_in .gift_bg img').addClass('img1');
+                    }
+                    $('.gx .gx_in .num').text(res.data.awardPrice + '天');
+                } else if (res.data.awardType == 4) {
+                    $('.gx .gx_in .num').text(res.data.awardPrice + '鉆石');
+                } else if (res.data.awardType == 5) {
+                    $('.gx .gx_in .gift').text(res.data.awardName + '*' + res.data.awardPrice);
+                    $('.gx .gx_in .num').text('');
+                }
+
+                $('.gx .gx_in .gift_bg img').attr('src', res.data.awardUrl);
+                $('.gx').show();
+                getPageInfo();
+                hideLoading(layerIndex)
+                xsSvgaClick = true;
+            } else if (res.code == 10007) {
+                hideLoading(layerIndex);
+                hideLoading(layerIndex);
+                $('.actOut').show();
+            } else {
+                xsSvgaClick = true;
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            xsSvgaClick = true;
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 水晶试炼场接口
+function getCaystalTrial (num) {
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/activity/magic/caystalTrial',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid, num },
+        success (res) {
+            if (res.code === 200) {
+                xsSvgaClick = true;
+                if (res.data != undefined) {
+                    $('.gx .gx_in .gift').text(res.data.awardName);
+                    $('.gx .gx_in .gift_bg img').removeClass('img1');
+                    if (res.data.awardType == 3 || res.data.awardType == 1 || res.data.awardType == 2) {
+                        if (res.data.awardType == 1) {
+                            $('.gx .gx_in .gift_bg img').addClass('img1');
+                        }
+                        $('.gx .gx_in .num').text(res.data.awardNum + '天');
+                    } else if (res.data.awardType == 4) {
+                        $('.gx .gx_in .num').text(res.data.awardNum + '鉆石');
+                    } else if (res.data.awardType == 5) {
+                        $('.gx .gx_in .gift').text(res.data.awardName + '*' + res.data.awardNum);
+                        $('.gx .gx_in .num').text('');
+                    }
+                    $('.gx .gx_in .gift_bg img').attr('src', res.data.awardUrl);
+                    $('.gx').show();
+                    // $('.gx').show();
+                    // $('.gx .gx_in .gift_bg img').attr('src', res.data.awardUrl);
+                    // $('.gx .gx_in .gift').text(res.data.awardName);
+                    // $('.gx .gx_in .num').text(res.data.awardNum + '天');
+                }
+                getCaystalTrialInit();
+                hideLoading(layerIndex)
+            } else {
+                xsSvgaClick = true;
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            xsSvgaClick = true;
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+$('.page2 .amethystStone .amethystStoneBut1').click(function () {
+    if (xsSvgaClick) {
+        var num = $('.page2 .amethystStone .lineBox p b').text();
+        if (num != 0) {
+            xsSvgaClick = false;
+            xsSvgaFun3()
+            setTimeout(function () {
+                getCaystalTrial(1)
+            }, 2000)
+        } else {
+            toastMsg('水晶石不足')
+        }
+    }
+
+})
+$('.page2 .amethystStone .amethystStoneBut5').click(function () {
+    if (xsSvgaClick) {
+        var num = $('.page2 .amethystStone .lineBox p b').text();
+        if (num != 0) {
+            xsSvgaClick = false;
+            xsSvgaFun3()
+            setTimeout(function () {
+                getCaystalTrial(5)
+            }, 2000)
+        } else {
+            toastMsg('水晶石不足')
+        }
+    }
+})
+// 获取水晶试炼场初始化接口
+var schedulevale;
+function getCaystalTrialInit () {
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/activity/magic/caystalTrialInit',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid },
+        success (res) {
+            if (res.code === 200) {
+                passStatus = res.data.passStatus;
+                if (passStatus == true) {
+                    caystalTrialLevel = 2;
+                    caystalTrialLevelIndex = 2;
+                } else {
+                    caystalTrialLevel = res.data.caystalTrialLevel;
+                    caystalTrialLevelIndex = res.data.caystalTrialLevel;
+                }
+                $('.page2 .amethystStone .lineBox p b').text(res.data.caystalNum);
+                $('.page2 .amethystStone .lineBox i strong').text(res.data.schedule);
+                schedulevale = res.data.schedule;
+                crystalTestingHround(schedulevale);
+                hideLoading(layerIndex)
+            } else {
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 处理水晶切换
+function crystalTestingHround (schedulevale) {
+    if (passStatus == true) {
+        $('.page2 .amethystStone .amethystStoneGift').attr('src', amethystStoneArr[caystalTrialLevel].img);
+        $('.page2 .amethystStone .stoneNick').attr('src', amethystStoneArr[caystalTrialLevel].giftNick);
+        $('.page2 .amethystStone .lineBox span').css('width', `${100}%`);
+        $('.page2 .amethystStone .lineBox i em').text(amethystStoneArr[caystalTrialLevel].num);
+        $('.page2 .amethystStone .lineBox i strong').text(amethystStoneArr[caystalTrialLevel].num);
+        $('.amethystStoneBut1').hide();
+        $('.amethystStoneBut5').hide();
+        $('.amethystStoneOut').show();
+    } else {
+        $('.page2 .amethystStone .amethystStoneGift').attr('src', amethystStoneArr[caystalTrialLevel].img);
+        $('.page2 .amethystStone .stoneNick').attr('src', amethystStoneArr[caystalTrialLevel].giftNick);
+        $('.page2 .amethystStone .lineBox i em').text(amethystStoneArr[caystalTrialLevel].num);
+        $('.page2 .amethystStone .lineBox span').css('width', `${(schedulevale / amethystStoneArr[caystalTrialLevel].num) * 100}%`);
+        if (caystalTrialLevel < caystalTrialLevelIndex) {
+            $('.amethystStoneBut1').hide();
+            $('.amethystStoneBut5').hide();
+            $('.amethystStoneOut').show();
+            $('.page2 .amethystStone .lineBox i strong').text(amethystStoneArr[caystalTrialLevel].num);
+            $('.page2 .amethystStone .lineBox span').css('width', `${100}%`);
+        } else if (caystalTrialLevel > caystalTrialLevelIndex) {
+            $('.amethystStoneBut1').hide();
+            $('.amethystStoneBut5').hide();
+            $('.amethystStoneOut').hide();
+            $('.page2 .amethystStone .lineBox i strong').text(0);
+            $('.page2 .amethystStone .lineBox span').css('width', `${0}%`);
+        }
+        else if (caystalTrialLevel == caystalTrialLevelIndex) {
+            $('.amethystStoneBut1').show();
+            $('.amethystStoneBut5').show();
+            $('.amethystStoneOut').hide();
+            $('.page2 .amethystStone .lineBox i strong').text(schedulevale);
+        }
+    }
+    if (caystalTrialLevel == 0) {
+        $('.page2 .amethystStone .right').hide();
+    } else {
+        $('.page2 .amethystStone .right').show();
+    }
+    if (caystalTrialLevel == amethystStoneArr.length - 1) {
+        $('.page2 .amethystStone .left').hide();
+    } else {
+        $('.page2 .amethystStone .left').show();
+    }
+}
+// 水晶左切换
+$('.page2 .amethystStone .right').click(function () {
+    if (caystalTrialLevel < amethystStoneArr.length - 1) {
+        caystalTrialLevel = 0;
+    } else {
+        caystalTrialLevel = caystalTrialLevel - 1;
+    }
+    crystalTestingHround(schedulevale);
+})
+// 水晶右切换
+$('.page2 .amethystStone .left').click(function () {
+    if (caystalTrialLevel >= amethystStoneArr.length - 1) {
+        caystalTrialLevel = amethystStoneArr.length - 1;
+    } else {
+        caystalTrialLevel = caystalTrialLevel + 1;
+    }
+
+    crystalTestingHround(schedulevale);
+})
+//点击查看原石奖励
+$('.page2 .amethystStone .amethystStoneGift').click(function () {
+    $('.look_put .look_put_in .gift').removeClass('gift2');
+    if (caystalTrialLevel != 0) {
+        $('.look_put .look_put_in .gift').addClass('gift1');
+        if (caystalTrialLevel == 2) {
+            $('.look_put .look_put_in .gift').removeClass('gift1');
+            $('.look_put .look_put_in .gift').addClass('gift2');
+        }
+    } else {
+        $('.look_put .look_put_in .gift').removeClass('gift1');
+    }
+    $('.look_put .look_put_in .gift').attr('src', amethystStoneArr[caystalTrialLevel].imgs);
+    $('.look_put .look_put_in .giftNick').text(amethystStoneArr[caystalTrialLevel].awardName)
+    $('.look_put .look_put_in .num').text(amethystStoneArr[caystalTrialLevel].value);
+    if (passStatus == true || caystalTrialLevel < caystalTrialLevelIndex) {
+        $('.look_put .obtained').show();
+    };
+    $('.look_put .p2').show();
+    $('.look_put').show();
+    bodyScroolFun(true);
+})
+// 问号查看奖励
+$('.page2 .amethystStoneList .wenhao').click(function () {
+    $('.look_put .look_put_in .gift').attr('src', './images/shanhu.png');
+    $('.look_put .look_put_in .giftNick').text("珊瑚头饰")
+    $('.look_put .look_put_in .num').text('3天');
+    $('.look_put .p1').show();
+    $('.look_put').show();
+})
+// 关闭查看奖励弹窗
+$('.look_put .look_put_in .but').click(function () {
+    $('.look_put .p2').hide();
+    $('.look_put .p1').hide();
+    $('.look_put .obtained').hide();
+    $('.look_put').hide();
+    bodyScroolFun(false);
+})
+//关闭恭喜弹窗
+$('.gx .gx_in .but').click(function () {
+    $('.gx').hide();
+})
+// 监听滚动
+$('.forestReward .forestReward_in .forestRewardPage2 ul').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.forestReward .forestReward_in .forestRewardPage2 ul')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 100 >= scrollHeight) {
+        if (scrollBool) {
+            page++;
+            getExplorerRecord(page);
+        }
+    }
+})
+// 初级探险
+$('.page1 .darkForest .primaryBut').click(function () {
+    if (xsSvgaClick) {
+        var num = $('.page1 .darkForest .rough b').text();
+        if (num != 0) {
+            xsSvgaClick = false;
+            xsSvgaFun1()
+            setTimeout(function () {
+                getExplorer(0, 1)
+            }, 2000)
+        } else {
+            toastMsg('原石不足')
+        }
+    }
+
+})
+// 高级探险
+$('.page1 .darkForest .seniorBut').click(function () {
+    if (xsSvgaClick) {
+        var num = $('.page1 .darkForest .rough b').text();
+        if (num != 0) {//num != 0
+            xsSvgaClick = false;
+            xsSvgaFun2()
+            setTimeout(function () {
+                getExplorer(1, 3)
+            }, 3000)
+        } else {
+            if (firstExplorer == false) {
+                xsSvgaClick = false;
+                xsSvgaFun2()
+                setTimeout(function () {
+                    getExplorer(1, 3)
+                }, 3000)
+            } else {
+                toastMsg('原石不足')
+            }
+        }
+    }
+})
+// 处理时间函数
+function timeFun (LR,) {
+    var times = Number($('.page3 .list .time b').attr('time'));
+    if (LR == 1) {
+        times = (times - (1000 * 60 * 60 * 24));
+        if (startTime > times) {
+            $('.page3 .list .time b').text(dateFormat(startTime, "MM月dd日"));
+            $('.page3 .list .time b').attr('time', startTime);
+            times = startTime
+            toastMsg('不能小于活动开始时间');
+        } else {
+            $('.page3 .list .time b').attr('time', (times));
+            $('.page3 .list .time b').text(dateFormat(times, "MM月dd日"));
+            getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+        }
+    } else {
+        if (times >= endTime) {
+            $('.page3 .list .time b').text(dateFormat(endTime, "MM月dd日"));
+            $('.page3 .list .time b').attr('time', endTime);
+            times = endTime
+            toastMsg('不能大于活动结束时间');
+        } else {
+            $('.page3 .list .time b').text(dateFormat((times + (1000 * 60 * 60 * 24)), "MM月dd日"));
+            $('.page3 .list .time b').attr('time', (times + (1000 * 60 * 60 * 24)));
+            getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+        }
+    }
+}
+// 左时间切换按钮
+$('.page3 .list .time .timeLeftBg').click(function () {
+    timeFun(1,)
+})
+// 右时间切换按钮
+$('.page3 .list .time .timeRightBg').click(function () {
+    timeFun(2,)
+})
+// tab切换
+$('.tab div').click(function () {
+    var i = $(this).index() + 1;
+    $(this).siblings().attr('id', '');
+    $(this).attr("id", `tab${i}`);
+    $(`.page${i}`).show();
+    if (i == 1) {
+        $('.page2').hide();
+        $('.page3').hide();
+    } else if (i == 2) {
+        $('.page1').hide();
+        $('.page3').hide();
+        getCaystalTrialInit();
+        getMagicList();
+    } else if (i == 3) {
+        $('.page1').hide();
+        $('.page2').hide();
+        currentTimes = 1;
+        getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+        $('.page3 .list').removeClass('list2');
+        $('.page3').show();
+    } else if (i == 4) {
+        $('.page1').hide();
+        $('.page2').hide();
+        currentTimes = 2;
+        getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+        $('.page3 .list').addClass('list2');
+        $('.page3').show();
+    }
+})
+// 切换总榜日榜
+$('.page3 .list .tabs div').click(function () {
+    var i = $(this).index() + 1;
+    $(this).addClass('tabAcative').siblings().removeClass('tabAcative');
+    if (i == 1) {
+        $('.page3 .list .tabs').css('margin',"1.48rem auto 0.3866666667rem")
+        $('.page3 .list .time').show();
+        rankType = 0;
+        getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+    } else {
+        $('.page3 .list .tabs').css('margin',"1.48rem auto 1rem")
+        $('.page3 .list .time').hide();
+        rankType = 1;
+        getRank(rankType, Number($('.page3 .list .time b').attr('time')), currentTimes);
+    }
+})
+// 获取榜单接口
+function getRank (rankType, currentTime, comeFrom) {
+    $('.page3 .list .notTop li').remove()
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/activity/magic/rank',
+        data: { pub_ticket: pubInfo.ticket, pub_uid: pubInfo.uid, rankType, currentTime: Number(currentTime), comeFrom },
+        success (res) {
+            if (res.code === 200) {
+                var top3 = res.data.rankList.slice(0, 3);
+                var notTop3 = res.data.rankList.slice(3);
+                // 处理自己榜单
+                $('.page3 .myList img').attr('src', res.data.userRank.avatar);
+                $('.page3 .myList .num').text(res.data.userRank.rank == 0 ? '未上榜' : res.data.userRank.rank);
+                $('.page3 .myList .nick').text(res.data.userRank.nick.length > 8 ? res.data.userRank.nick.slice(0, 8) + '...' : res.data.userRank.nick);
+                $('.page3 .myList .score').text(comeFrom == 1 ? 'peko值:' + unitProcessing(res.data.userRank.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.data.userRank.rankValue, 10000, 1, 'w'));
+                hideLoading(layerIndex)
+                // 处理前三
+                if (top3.length < 3) {
+                    let arr = new Array(3 - top3.length).fill({
+                        avatar: './images/logo.png',
+                        nick: '虚位以待',
+                        rankValue: ""
+                    })
+                    top3.push(...arr)
+                }
+                top3.forEach((res, index) => {
+                    $(`.page3 .list .top${index + 1} .txBg`).attr('src', res.avatar);
+                    $(`.page3 .list .top${index + 1} .nick`).text(res.nick.length > 6 ? res.nick.slice(0, 6) + '...' : res.nick);
+                    $(`.page3 .list .top${index + 1} p`).text(comeFrom == 1 ? 'peko值:' + unitProcessing(res.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.rankValue, 10000, 1, 'w'));
+                })
+                // 非前三
+                var str = '';
+                notTop3.forEach((res, index) => {
+                    str += `
+                        <li>
+                            <div class="num">NO.${index + 4}</div>
+                            <img src="${res.avatar}" alt="">
+                            <div class="nick">${res.nick.length > 6 ? res.nick.slice(0, 6) + '...' : res.nick}</div>
+                            <div class="score">${comeFrom == 1 ? 'peko值:' + unitProcessing(res.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.rankValue, 10000, 1, 'w')}</div>
+                        </li>`
+                })
+                $('.page3 .list .notTop').append(str);
+            } else {
+                hideLoading(layerIndex)
+                toastMsg(res.message)
+            }
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 打开榜单奖励
+$('.page3 .list .rule_list_icon').click(function () {
+    $('.list_r').show();
+    bodyScroolFun(true);
+})
+$('.list_r').click(function () {
+    $(this).hide();
+    bodyScroolFun(false);
+})
+// 首页跳转房间
+$('.page1 .toast .to div').click(function (params) {
+    var room = $(this).attr('room');
+    var click = $(this).attr('click');
+    if (click == 1) {
+        console.log('已完成');
+    } else {
+        if (browser.ios) {
+            window.webkit.messageHandlers.openRoom.postMessage(roomUid);
+        } else if (browser.android) {
+            if (androidJsObj && typeof androidJsObj === 'object') {
+                window.androidJsObj.openRoom(roomUid);
+            }
+        }
+    }
+})
+
+// 控制body是否可以滑动
+function bodyScroolFun (bool) {
+    if (bool) {
+        $('body').css('overflow', 'hidden');
+    } else {
+        $('body').css('overflow', 'auto');
+
+    }
+}
+// 切换森林奖励/记录按钮
+var forestRewardPageClick = true;
+$('.forestReward .forestReward_in .forestRewardTab div').click(function () {
+    var i = $(this).index() + 1;
+    if (i == 1) {
+        $(this).addClass('forestRewardTab1_active').siblings().removeClass('forestRewardTab2_active').addClass('forestRewardTab2s');
+        $('.forestRewardPage1').show();
+        $('.forestRewardPage2').hide();
+    } else {
+        $(this).addClass('forestRewardTab2_active').siblings().removeClass('forestRewardTab1_active').addClass('forestRewardTab1');
+        $('.forestRewardPage2').show();
+        $('.forestRewardPage1').hide();
+    }
+    return false
+})
+// 高级探险/初级探险切换按钮
+$('.forestReward .forestReward_in .forestRewardPage1 .box1 div').click(function () {
+    var i = $(this).index() + 1;
+    $(this).addClass('active').siblings().removeClass('active')
+    if (i == 1) {
+        $('.forestReward .forestReward_in .forestRewardPage1 .forestRewardPage1Bg').attr('src', './images/forestRewardPage1Bg1.png');
+    } else {
+        $('.forestReward .forestReward_in .forestRewardPage1 .forestRewardPage1Bg').attr('src', './images/forestRewardPage1Bg2.png');
+    }
+    return false
+})
+// 打开活动规则
+$('.hdader .rule_icon').click(function (params) {
+    $('.rule').show();
+    bodyScroolFun(true);
+})
+//关闭活动规则
+$('.rule').click(function (params) {
+    $('.rule').hide();
+    bodyScroolFun(false);
+})
+// 打开记录以及奖池
+$('.page1 .darkForest .prizePoolRecord').click(function (params) {
+    bodyScroolFun(true);
+    $('.forestReward .forestReward_in .forestRewardPage2 ul li').remove();
+    page = 1;
+    getExplorerRecord(page);
+    $(".forestReward").show();
+})
+// 关闭记录以及奖池
+$(".forestReward").click(function (params) {
+    bodyScroolFun(false);
+    $(this).hide();
+})
+
+// 返回页面 重新请求接口
+var hiddenProperty = 'hidden' in document ? 'hidden' :
+    'webkitHidden' in document ? 'webkitHidden' :
+        'mozHidden' in document ? 'mozHidden' : null;
+
+var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');
+var onVisibilityChange = function () {
+    if (!document[hiddenProperty]) {
+        location.reload()
+    }
+}
+document.addEventListener(visibilityChangeEvent, onVisibilityChange);

view/peko/activity/act-mid-autumn-2021/js/index.js

@@ -8,7 +8,7 @@ const showLoading = () => {
     layer.open({
         type: 2,
         shadeClose: false,
-        content: '加载中...',
+        content: '加載中...',
         success(e) {
             layerIndex = $(e).attr('index')
         }
@@ -47,7 +47,7 @@ const getProgress = () => {
         },
         error(err) {
             // hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -85,7 +85,7 @@ const getRanking = () => {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }

view/peko/activity/act-mid-autumn/js/index.js

@@ -8,7 +8,7 @@ const showLoading = () => {
     layer.open({
         type: 2,
         shadeClose: false,
-        content: '加载中...',
+        content: '加載中...',
         success(e) {
             layerIndex = $(e).attr('index')
         }
@@ -47,7 +47,7 @@ const getProgress = () => {
         },
         error(err) {
             // hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }
@@ -85,7 +85,7 @@ const getRanking = () => {
         },
         error(err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }

view/peko/activity/act-midAutumnFestival-2022/index.html

@@ -52,7 +52,7 @@
                 </div>
             </div>
             <div class="toa5">
-                <p>每赠送中秋礼物200钻获得月饼券*1</p>
+                <p>每赠送中秋礼物200鉆获得月饼券*1</p>
                 <span></span>
             </div>
         </div>
@@ -121,7 +121,7 @@
                 <div><img src="./images/total.png" alt=""></div>
             </div>
             <div class="date">
-                <span date="2022-09-07" style="color: #BD3535; background: #ECAB44;">9.07</span>
+                <span date="2022-09-07">9.07</span>
                 <span date="2022-09-08">9.08</span>
                 <span date="2022-09-09">9.09</span>
                 <span date="2022-09-10">9.10</span>
@@ -334,7 +334,7 @@
         <div class="gx_in">
             <img src="./images/logo.png" alt="" class="gift">
             <p>名称</p>
-            <span>266钻石</span>
+            <span>266鉆石</span>
             <img src="./images/shouxia.png" alt="" class="but">
         </div>
     </div>

view/peko/activity/act-midAutumnFestival-2022/js/index.js

@@ -1,6 +1,6 @@
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -108,7 +108,7 @@ const renderDM = (item) => {
 }
 var totalMoonTicketNum; //总获得月饼券数量
 var usableMoonTicketNum; //当前可用月饼券数量
-var totalSendGoldNum; //总送出活动礼物钻石
+var totalSendGoldNum; //总送出活动礼物鉆石
 var moonid;
 var roomUid;
 var meetNum;
@@ -123,6 +123,7 @@ var txL = '';//头像左
 var txR = '';//头像右
 var totalLowMakeNum;
 var totalDiyMakeNum;
+var endTime; //结束时间
 $(function () {
     getInfoFromClient();
     setTimeout(function () {
@@ -166,7 +167,7 @@ function getRecommendRoom () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -190,7 +191,7 @@ function getConfessions () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -205,6 +206,7 @@ function getUserInfo () {
         success (res) {
             if (res.code === 200) {
                 var timestamp = new Date().getTime();
+                endTime = res.data.endTime;
                 sessionStorageVal = localStorage.getItem('sessionStorageVal');
                 if (timestamp >= res.data.endTime) {
                     if (sessionStorageVal == 0 || sessionStorageVal == undefined) {
@@ -216,6 +218,7 @@ function getUserInfo () {
                             localStorage.setItem("sessionStorageVal", 1);
                             $('.page1').hide();
                             $('.tabSwitch .tabSwitch4').addClass('tabSwitch_act4').siblings().removeClass('tabSwitch_act1');
+                            rankDateStr = "2022-09-12"
                             cpListRank();
                             InitMyCpList()
                             $('.page4').show();
@@ -326,7 +329,7 @@ function getUserInfo () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -390,7 +393,7 @@ $('.toaks div span').click(function () {
                 },
                 error (err) {
                     hideLoading(layerIndex)
-                    toastMsg('网络错误，请退出重进')
+                    toastMsg('網絡錯誤，請退出重進')
                 }
             })
         }
@@ -459,7 +462,7 @@ function getConvert (convertType) {//convertType 1:初级兑换 2:高级兑换
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
             lhjBut = true;
         }
     })
@@ -732,7 +735,7 @@ $('.moonCake .make2 .but').click(function () {
             },
             error (err) {
                 hideLoading(layerIndex)
-                toastMsg('网络错误，请退出重进')
+                toastMsg('網絡錯誤，請退出重進')
             }
         })
     }
@@ -812,7 +815,7 @@ function moonMakeFun (moonIds, moonMsg, type) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -885,7 +888,7 @@ function cpMyFun () {
                             },
                             error (err) {
                                 hideLoading(layerIndex)
-                                toastMsg('网络错误，请退出重进')
+                                toastMsg('網絡錯誤，請退出重進')
                             }
                         })
                     } else {
@@ -900,7 +903,7 @@ function cpMyFun () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -934,7 +937,7 @@ function confessionsDefault ($this) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -971,7 +974,7 @@ $('.sendPut .sendPut_in .but').click(function () {
             },
             error (err) {
                 hideLoading(layerIndex)
-                toastMsg('网络错误，请退出重进')
+                toastMsg('網絡錯誤，請退出重進')
             }
         })
     }
@@ -1055,7 +1058,7 @@ function getConvertRecord (page) {
         error (err) {
             scrollBool = true;
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -1127,7 +1130,7 @@ function makerecords (page) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
             makerecordsBool = true;
         }
     })
@@ -1226,7 +1229,7 @@ function sendRecord (page, recordType) {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
             recordTypeBool = true;
         }
     })
@@ -1269,7 +1272,8 @@ $('.giftRecord .giftRecord_in .tab2').scroll(function () {
         }
     }
 })
-var rankDateStr = '2022-09-07' //cp榜日榜日期
+// var rankDateStr = '2022-09-07' //cp榜日榜日期
+var rankDateStr = dateFormat(new Date().getTime(), 'yyyy-MM-dd');//cp榜日榜日期
 // 获取cp榜单接口
 function cpListRank () {
     showLoading()
@@ -1324,7 +1328,7 @@ function cpListRank () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -1388,7 +1392,7 @@ function mlListRank () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -1457,7 +1461,7 @@ function listMyRankFun () {
         },
         error (err) {
             hideLoading(layerIndex)
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -1531,17 +1535,22 @@ $('.tabBang div').click(function () {
 $('.cpList .tab div').click(function () {
     var i = $(this).index();
     if (i == 0) {
-        rankDateStr = '2022-09-07';
+        nowDate = new Date().getTime();
+        if(endTime > nowDate){
+            rankDateStr = dateFormat(new Date().getTime(), 'yyyy-MM-dd');
+        }else {
+            rankDateStr = "2022-09-12"
+        }
         cpListRank();
-        InitMyCpList()
-        $(".cpList .date span").eq(0).css({
-            'color': '#BD3535',
-            'background': '#ECAB44'
-        })
-        $(".cpList .date span").eq(0).siblings().css({
-            'color': '#03546C',
-            'background': '#4BD2E0'
-        })
+        InitMyCpList();
+        // $(".cpList .date span").eq(0).css({
+        //     'color': '#BD3535',
+        //     'background': '#ECAB44'
+        // })
+        // $(".cpList .date span").eq(0).siblings().css({
+        //     'color': '#03546C',
+        //     'background': '#4BD2E0'
+        // })
         $(this).find('img').attr('src', './images/day_active.png');
         $(this).siblings().find('img').attr('src', './images/total.png');
         $('.cpList .date').show();
@@ -1557,6 +1566,20 @@ $('.cpList .tab div').click(function () {
 
 // 初始化当前用户关联cp列表
 function InitMyCpList () {
+    let $date = $('.cpList .date span');
+    $date.each(index=>{
+        // console.log($date.eq(index).attr("date"));
+        if(rankDateStr == $date.eq(index).attr("date")){
+            $(".cpList .date span").eq(index).css({
+                'color': '#BD3535',
+                'background': '#ECAB44'
+            })
+            $(".cpList .date span").eq(index).siblings().css({
+                'color': '#03546C',
+                'background': '#4BD2E0'
+            })
+        }
+    })
     $('.myCpList').removeClass('myCpList_active');
     $('.myCpList img').removeClass('more_active');
     $('.myCpList ul').css('overflow-y', 'hidden');
@@ -1571,14 +1594,14 @@ function InitMyCpList () {
 // 日榜日期切换
 $('.cpList .date span').click(function () {
     var i = $(this).index();
-    $(".cpList .date span").eq(i).css({
-        'color': '#BD3535',
-        'background': '#ECAB44'
-    })
-    $(".cpList .date span").eq(i).siblings().css({
-        'color': '#03546C',
-        'background': '#4BD2E0'
-    })
+    // $(".cpList .date span").eq(i).css({
+    //     'color': '#BD3535',
+    //     'background': '#ECAB44'
+    // })
+    // $(".cpList .date span").eq(i).siblings().css({
+    //     'color': '#03546C',
+    //     'background': '#4BD2E0'
+    // })
     rankDateStr = $(".cpList .date span").eq(i).attr('date');
     cpListRank();
     InitMyCpList();

view/peko/activity/act-nameplate-cp/js/public.js

@@ -4,7 +4,7 @@ var browser = checkVersion();
 // if (EnvCheck() === 'test') new VConsole
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -46,7 +46,7 @@ const getUserNameplateInfo = () => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }
@@ -112,7 +112,7 @@ const sendApply = (mpId, mpTxt, index) => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }

view/peko/activity/act-nameplate-cp/js/record.js

@@ -3,7 +3,7 @@ if (EnvCheck() === 'test') new VConsole
 
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -64,7 +64,7 @@ const getUserApplyRecord = () => {
           },
           error(){
             hideLoading(layerIndex);
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
           }
     })
 }

view/peko/activity/act-nameplate/index.html

@@ -45,7 +45,7 @@
             <p>剩余7天</p>
             <div class="nameplate">
               <img src="http://image.uat.zhongjialx.com/FqVz-oYR2lzqfzIlZNM3BrA016cX?imageslim" alt="">
-              <span>夜莺看看</span>
+              <span>peko看看</span>
             </div>
             <div class="delay-btn">
               <img src="./images/delay-btn.png" alt="">

view/peko/activity/act-nameplate/js/nobleHighRank.js

@@ -4,7 +4,7 @@ var browser = checkVersion();
 if (EnvCheck() === 'test') new VConsole
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -50,7 +50,7 @@ function getVipNameplateList () {
             }
         },
         error (err) {
-            toastMsg('网络错误，请退出重进')
+            toastMsg('網絡錯誤，請退出重進')
         }
     })
 }
@@ -82,7 +82,7 @@ $('.list li .but').click(function () {
                     }
                 },
                 error (err) {
-                    toastMsg('网络错误，请退出重进')
+                    toastMsg('網絡錯誤，請退出重進')
                 }
             })
         } else {

view/peko/activity/act-nameplate/js/nobleHighRank_record.js

@@ -3,7 +3,7 @@ if (EnvCheck() === 'test') new VConsole
 
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -64,7 +64,7 @@ const getUserApplyRecord = () => {
         },
         error () {
             hideLoading(layerIndex);
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
         }
     })
 }

view/peko/activity/act-nameplate/js/public.js

@@ -5,7 +5,7 @@ var info = {};
 if (EnvCheck() === 'test') new VConsole
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -49,7 +49,7 @@ const getUserNameplateInfo = () => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }
@@ -103,7 +103,7 @@ const getUserNameplateList = (type) => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }
@@ -158,7 +158,7 @@ const getNewNameplateList = (type) => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }
@@ -217,7 +217,7 @@ const delayNamaplateConfirm = (params) => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误')
+      toastMsg('網絡錯誤')
     }
   })
 }
@@ -253,7 +253,7 @@ const applyNewNamaplateConfirm = (params) => {
     },
     error(){
       hideLoading(layerIndex);
-      toastMsg('网络错误,请退出重进')
+      toastMsg('網絡錯誤,請退出重進')
     }
   })
 }

view/peko/activity/act-nameplate/js/record.js

@@ -3,7 +3,7 @@ if (EnvCheck() === 'test') new VConsole
 
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加载中...') => {
+const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -64,7 +64,7 @@ const getUserApplyRecord = () => {
           },
           error(){
             hideLoading(layerIndex);
-            toastMsg('网络错误')
+            toastMsg('網絡錯誤')
           }
     })
 }

view/peko/activity/act-new-year-2021/index.html

@@ -59,21 +59,21 @@
                 <div class="gift_in1">
                     <img src="./images/xr.png" alt="">
                     <b>顽皮雪人</b>
-                    <p>价值520钻石</p>
+                    <p>价值520鉆石</p>
                 </div>
                 <div class="gift_in2">
                     <img src="./images/yh.png" alt="">
                     <h3>开启时间</h3>
                     <i class="i">2月15日-2月21日</i>
                     <b>贺岁烟花</b>
-                    <p>价值520钻石</p>
+                    <p>价值520鉆石</p>
                 </div>
                 <div class="gift_in3">
                     <img src="./images/ty.png" alt="">
                     <h3>开启时间</h3>
                     <i class="i">2月22日-2月28日</i>
                     <b>糯米汤圆</b>
-                    <p>价值520钻石</p>
+                    <p>价值520鉆石</p>
                 </div>
             </div>
         </div>

view/peko/activity/act-ocean/css/mall.css

@@ -12,23 +12,23 @@
 
 body {
   font-family: 'pingfang-medium';
-  background: linear-gradient(#3491F5, #60C7FC) no-repeat 0 0/100% 100%;
+  background-color: #F43C58;
 }
 
 .banner {
   width: 10rem;
-  height: 6.66667rem;
+  height: 8.26667rem;
   background: url("../images/mall/banner.png") no-repeat 0 0/100% 100%;
 }
 
 .buy-area {
-  width: 9.46667rem;
-  height: 14.4rem;
+  width: 9.33333rem;
+  height: 12.37333rem;
   margin: auto;
   box-sizing: border-box;
-  padding: 1.06667rem 0.56rem 0 0.8rem;
+  padding: 1.2rem 0.50667rem 0 0.74667rem;
   background: url("../images/mall/buy-area.png") no-repeat 0 0/100% 100%;
-  margin-top: -0.88rem;
+  margin-top: -4rem;
 }
 
 .buy-area.bg-long {
@@ -38,7 +38,7 @@ body {
 .buy-area li {
   display: flex;
   align-items: center;
-  margin-bottom: 0.53333rem;
+  margin-bottom: 0.8rem;
 }
 
 .buy-area li.li-bg-long {
@@ -46,33 +46,33 @@ body {
 }
 
 .buy-area li .headwear-pic {
-  width: 2.4rem;
-  height: 2.4rem;
-  background-color: #92CCFB;
+  width: 1.73333rem;
+  height: 1.73333rem;
+  background-color: #F43C58;
   border-radius: 0.4rem;
-  margin-right: 0.4rem;
+  margin-right: 0.26667rem;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 
 .buy-area li .headwear-pic img {
-  width: 2rem;
-  height: 2rem;
+  width: 1.33333rem;
+  height: 1.33333rem;
 }
 
 .buy-area li .headwear-info {
   flex: 1;
-  height: 1.6rem;
+  height: 1.46667rem;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  color: white;
-  font-size: 0.34667rem;
+  color: #C58138;
+  font-size: 0.32rem;
 }
 
 .buy-area li .headwear-info .headwear-name {
-  font-size: 0.48rem;
+  font-size: 0.42667rem;
   font-weight: bold;
 }
 
@@ -81,7 +81,7 @@ body {
 }
 
 .buy-area li .headwear-info .headwear-award {
-  color: #FEEF60;
+  color: #ED7B50;
 }
 
 .buy-area li .buy-btn {
@@ -99,7 +99,7 @@ body {
   left: 0;
   z-index: 99;
   width: 100%;
-  height: 1.62667rem;
+  height: 1.73333rem;
   background: url("../images/mall/bottom.png") no-repeat 0 0/100% 100%;
   display: flex;
   align-items: center;
@@ -112,33 +112,45 @@ body {
 .bottom .avatar {
   width: 1.33333rem;
   height: 1.33333rem;
-  margin: 0 0.26667rem 0 0.53333rem;
+  margin-left: 0.56rem;
+  margin-right: 0.26667rem;
 }
 
 .bottom .avatar img {
   width: 100%;
+  height: 100%;
   border-radius: 50%;
 }
 
 .bottom .info-wrap {
   flex: 1;
-  height: 1.17333rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  font-size: 0.26667rem;
-  color: white;
+  margin-top: 0.18667rem;
 }
 
-.bottom .info-wrap .nick {
-  font-size: 0.37333rem;
+.bottom .info-wrap .fragment-num, .bottom .info-wrap .diamond-num {
+  width: 3.33333rem;
+  height: 0.56rem;
+  background-color: #BD7F38;
+  border-radius: 0.26667rem;
+  line-height: 0.56rem;
+  font-size: 0.34667rem;
   font-weight: bold;
+  color: white;
+  text-indent: 0.13333rem;
+  margin-bottom: 0.13333rem;
+}
+
+.bottom .add {
+  width: 0.54667rem;
+  height: 0.54667rem;
+  margin-top: -0.64rem;
+  margin-right: 0.93333rem;
 }
 
 .bottom .recharge {
-  width: 2rem;
-  height: 0.85333rem;
-  margin-right: 0.8rem;
+  width: 1.92rem;
+  height: 0.82667rem;
+  margin-right: 0.98667rem;
 }
 
 .bottom .recharge img {

view/peko/activity/act-ocean/css/mall.scss

@@ -20,64 +20,66 @@
 
 body{
     font-family: 'pingfang-medium';
-    background: linear-gradient(#3491F5, #60C7FC) no-repeat 0 0/100% 100%;
+    // background: linear-gradient(#3491F5, #60C7FC) no-repeat 0 0/100% 100%;
+    background-color: #F43C58;
 }
 
 .banner{
     width: px2rem(750);
-    height: px2rem(500);
+    height: px2rem(620);
     background: url('../images/mall/banner.png') no-repeat 0 0/100% 100%;
 }
 .buy-area{
-    width: px2rem(710);
+    width: px2rem(700);
     // height: px2rem(900);
-    height: px2rem(1080);
+    // height: px2rem(1080);
+    height: px2rem(928);
     margin: auto;
     box-sizing: border-box;
-    padding: px2rem(80) px2rem(42) 0 px2rem(60);
+    padding: px2rem(90) px2rem(38) 0 px2rem(56);
     background: url('../images/mall/buy-area.png') no-repeat 0 0/100% 100%;
-    margin-top: px2rem(-66);
+    margin-top: px2rem(-300);
     &.bg-long{
         background-image: url('../images/mall/buy-area-long.png');
     }
     li{
         display: flex;
         align-items: center;
-        margin-bottom: px2rem(40);
+        margin-bottom: px2rem(60);
         &.li-bg-long{
             margin-bottom: px2rem(90);
         }
         .headwear-pic{
-            width: px2rem(180);
-            height: px2rem(180);
-            background-color: #92CCFB;
+            width: px2rem(130);
+            height: px2rem(130);
+            background-color: #F43C58;
             border-radius: px2rem(30);
-            margin-right: px2rem(30);
+            margin-right: px2rem(20);
             display: flex;
             justify-content: center;
             align-items: center;
             img{
-                width: px2rem(150);
-                height: px2rem(150);
+                width: px2rem(100);
+                height: px2rem(100);
             }
         }
         .headwear-info{
             flex: 1;
-            height: px2rem(120);
+            height: px2rem(110);
             display: flex;
             flex-direction: column;
             justify-content: space-between;
-            color: white;
-            font-size: px2rem(26);
+            color: #C58138;
+            font-size: px2rem(24);
             .headwear-name{
-                font-size: px2rem(36);
+                font-size: px2rem(32);
                 font-weight: bold;
             }
             .headwear-price{
                 margin-bottom: px2rem(-12);
             }
             .headwear-award{
-                color: #FEEF60;
+                color: #ED7B50;
             }
         }
         .buy-btn{
@@ -95,7 +97,7 @@ body{
     left: 0;
     z-index: 99;
     width: 100%;
-    height: px2rem(122);
+    height: px2rem(130);
     background: url('../images/mall/bottom.png') no-repeat 0 0/100% 100%;
     display: flex;
     align-items: center;
@@ -105,29 +107,40 @@ body{
     .avatar{
         width: px2rem(100);
         height: px2rem(100);
-        margin: 0 px2rem(20) 0 px2rem(40);
+        margin-left: px2rem(42);
+        margin-right: px2rem(20);
         img{
             width: 100%;
+            height: 100%;
             border-radius: 50%;
         }
     }
     .info-wrap{
         flex: 1;
-        height: px2rem(88);
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        font-size: px2rem(20);
-        color: white;
-        .nick{
-            font-size: px2rem(28);
+        margin-top: px2rem(14);
+        .fragment-num, .diamond-num{
+            width: px2rem(250);
+            height: px2rem(42);
+            background-color: #BD7F38;
+            border-radius: px2rem(20);
+            line-height: px2rem(42);
+            font-size: px2rem(26);
             font-weight: bold;
+            color: white;
+            text-indent: px2rem(10);
+            margin-bottom: px2rem(10);
         }
     }
+    .add{
+        width: px2rem(41);
+        height: px2rem(41);
+        margin-top: px2rem(-48);
+        margin-right: px2rem(70);
+    }
     .recharge{
-        width: px2rem(150);
-        height: px2rem(64);
-        margin-right: px2rem(60);
+        width: px2rem(144);
+        height: px2rem(62);
+        margin-right: px2rem(74);
         img{
             width: 100%;
         }