新增代充跳转页

view/peko/activity/2023-Valentines-Day/index.html

@@ -241,7 +241,7 @@
             </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 class="tips">*情人节限定5位靓号:52XXX（XXX为随机数字，一组为2个靓号，<br>联系客服领取：LINE: pikoyuyin)</div> -->
         </div>
     </div>
     <!-- 我的cp弹窗 -->

view/peko/activity/2023-Valentines-Day/js/index.js

@@ -370,7 +370,7 @@ function buy(id, num, type) {
                         $('.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 .gx_in .tips').html(`*情人節限定5位靚號:52XXX（XXX為隨機數字，一組為2個靚號，<br>聯系客服領取：LINE: pikoyuyin)`)
                         $('.gx').show()
 
                     } else {

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

@@ -76,7 +76,7 @@
         <div class="tab2_contain">
             <div class="rule_wrap">
                 <p class="rule_item">
-                    活动期间，每日登录pekoApp即可免费获赠一个魔法棒（每台设备每日限一次）
+                    活动期间，每日登录pikoApp即可免费获赠一个魔法棒（每台设备每日限一次）
                 </p>
             </div>
             <div class="panel_wrap">

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

@@ -756,7 +756,7 @@ function getRank (rankType, currentTime, comeFrom) {
                 $('.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'));
+                $('.page3 .myList .score').text(comeFrom == 1 ? 'piko值:' + unitProcessing(res.data.userRank.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.data.userRank.rankValue, 10000, 1, 'w'));
                 hideLoading(layerIndex)
                 // 处理前三
                 if (top3.length < 3) {
@@ -770,7 +770,7 @@ function getRank (rankType, currentTime, comeFrom) {
                 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'));
+                    $(`.page3 .list .top${index + 1} p`).text(comeFrom == 1 ? 'piko值:' + unitProcessing(res.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.rankValue, 10000, 1, 'w'));
                 })
                 // 非前三
                 var str = '';
@@ -780,7 +780,7 @@ function getRank (rankType, currentTime, comeFrom) {
                             <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>
+                            <div class="score">${comeFrom == 1 ? 'piko值:' + unitProcessing(res.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.rankValue, 10000, 1, 'w')}</div>
                         </li>`
                 })
                 $('.page3 .list .notTop').append(str);

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>peko看看</span>
+              <span>piko看看</span>
             </div>
             <div class="delay-btn">
               <img src="./images/delay-btn.png" alt="">

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

@@ -11,9 +11,26 @@
 html,
 body {
   font-family: "din-medium";
-  background: #531800;
+  background: #E17E3D;
   overflow-x: hidden;
 }
+html::-webkit-scrollbar,
+body::-webkit-scrollbar {
+  display: none;
+}
+
+.back {
+  position: fixed;
+  top: 0.9333333333rem;
+  left: 0.4533333333rem;
+  z-index: 9;
+  width: 0.8266666667rem;
+  height: 0.8266666667rem;
+}
+.back img {
+  width: 100%;
+  height: 100%;
+}
 
 .wrap {
   width: 100%;
@@ -181,6 +198,7 @@ body {
   padding-left: 0.6266666667rem;
 }
 .wrap .game-area .select-time ul li {
+  transition: all, 0.2s;
   position: relative;
   z-index: 99;
   width: 1.84rem;
@@ -834,28 +852,29 @@ body {
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap {
   font-family: "pingfang-regular";
-  width: 6.1333333333rem;
+  width: 5.8666666667rem;
   height: 0.9333333333rem;
   background-color: rgba(255, 255, 255, 0.3);
   border-radius: 0.48rem;
   margin: 0.2666666667rem auto 0.08rem;
+  display: flex;
+  overflow: hidden;
+  padding: 0.0666666667rem;
+  box-sizing: border-box;
+  justify-content: space-between;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap span {
   display: inline-block;
-  width: 2.8rem;
+  width: 50%;
   height: 0.8rem;
   line-height: 0.8rem;
   text-align: center;
   font-size: 0.4rem;
   color: white;
-  margin-top: 0.0666666667rem;
-}
-.wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap span:first-child {
-  margin-left: 0.1866666667rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap .active {
   background-color: white;
-  color: #F5A03A;
+  color: #F56801;
   border-radius: 0.4rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap {
@@ -911,14 +930,14 @@ body {
   margin: 0;
   margin-top: -0.2666666667rem;
   margin-bottom: 0.0533333333rem;
-  color: #FF5110;
+  color: #fff;
   font-size: 0.32rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank {
   overflow: auto;
   position: absolute;
   width: 100%;
-  height: 6.9rem;
+  height: 7rem;
   padding: 0.4rem 0.2666666667rem 0;
   box-sizing: border-box;
   margin-top: 0.25rem;
@@ -934,7 +953,7 @@ body {
   width: 0.4rem;
   font-size: 0.4rem;
   font-weight: bold;
-  color: #fff;
+  color: #333;
   text-align: center;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info {
@@ -952,12 +971,12 @@ body {
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info .others-nick {
   font-size: 0.3733333333rem;
   font-weight: bold;
-  color: #fff;
+  color: #333333;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num {
   font-size: 0.3466666667rem;
   font-weight: bold;
-  color: #fff;
+  color: #FF7700;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num b {
   color: #FF5110;
@@ -981,11 +1000,13 @@ body {
   font-size: 0.3466666667rem;
   font-weight: bold;
   color: white;
+  white-space: nowrap;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine .mine-info {
   flex: 1;
   display: flex;
   align-items: center;
+  white-space: nowrap;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine .mine-info img {
   width: 1.0666666667rem;
@@ -1007,9 +1028,10 @@ body {
   font-size: 0.3466666667rem;
   font-weight: bold;
   color: #fff;
+  white-space: nowrap;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num b {
-  color: #FF5110;
+  color: #fff;
   font-weight: bold;
 }
 .wrap .shade-mask-fragmentNum {

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

@@ -25,12 +25,27 @@
 html,
 body {
     font-family: 'din-medium';
-    background: #531800;
+    background: #E17E3D;
     // 海浪svga过长
     overflow-x: hidden;
     // height: 19rem;
+    &::-webkit-scrollbar{
+        display: none;
+    }
 }
+.back {
+    position: fixed;
+    top: px2rem(70, );
+    left: px2rem(34, );
+    z-index: 9;
+    width: px2rem(62, );
+    height: px2rem(62, );
 
+    img {
+        width: 100%;
+        height: 100%;
+    }
+}
 .wrap {
     width: 100%;
     height: 100vh;
@@ -291,6 +306,7 @@ body {
                 padding-left: px2rem(47);
 
                 li {
+                    transition: all, 0.2s;
                     position: relative;
                     z-index: 99;
                     width: px2rem(138);
@@ -1098,30 +1114,35 @@ body {
 
                 .tab-wrap {
                     font-family: 'pingfang-regular';
-                    width: px2rem(460);
+                    width: px2rem(440);
                     height: px2rem(70);
                     background-color: rgba($color: #fff, $alpha: .3);
                     border-radius: px2rem(36);
                     margin: px2rem(20) auto px2rem(6);
+                    display: flex;
+                    overflow: hidden;
+                    padding: px2rem(5, );
+                    box-sizing: border-box;
+                    justify-content: space-between;
 
                     span {
                         display: inline-block;
-                        width: px2rem(210);
+                        // width: px2rem(210, );
+                        width: 50%;
                         height: px2rem(60);
                         line-height: px2rem(60);
                         text-align: center;
                         font-size: px2rem(30);
                         color: white;
-                        margin-top: px2rem(5);
 
-                        &:first-child {
-                            margin-left: px2rem(14);
-                        }
+                        // &:first-child {
+                        //     margin-left: px2rem(14);
+                        // }
                     }
 
                     .active {
                         background-color: white;
-                        color: #F5A03A;
+                        color: #F56801;
                         border-radius: px2rem(30);
                     }
                 }
@@ -1188,7 +1209,7 @@ body {
                             margin: 0;
                             margin-top: px2rem(-20);
                             margin-bottom: px2rem(4);
-                            color: #FF5110;
+                            color: #fff;
                             font-size: px2rem(24);
                         }
                     }
@@ -1199,7 +1220,7 @@ body {
                 overflow: auto;
                 position: absolute;
                 width: 100%;
-                height: 6.9rem;
+                height: 7rem;
                 // background-color: white;
                 padding: px2rem(30) px2rem(20) 0;
                 box-sizing: border-box;
@@ -1221,7 +1242,7 @@ body {
                         width: px2rem(30);
                         font-size: px2rem(30);
                         font-weight: bold;
-                        color: #fff;
+                        color: #333;
                         text-align: center;
                     }
 
@@ -1241,14 +1262,14 @@ body {
                         .others-nick {
                             font-size: px2rem(28);
                             font-weight: bold;
-                            color: #fff;
+                            color: #333333;
                         }
                     }
 
                     .others-diamond-num {
                         font-size: px2rem(26);
                         font-weight: bold;
-                        color: #fff;
+                        color: #FF7700;
 
                         b {
                             color: #FF5110;
@@ -1277,12 +1298,14 @@ body {
                     font-size: px2rem(26);
                     font-weight: bold;
                     color: white;
+                    white-space: nowrap;
                 }
 
                 .mine-info {
                     flex: 1;
                     display: flex;
                     align-items: center;
+                    white-space: nowrap;
 
                     img {
                         width: px2rem(80);
@@ -1307,9 +1330,10 @@ body {
                     font-size: px2rem(26);
                     font-weight: bold;
                     color: #fff;
+                    white-space: nowrap;
 
                     b {
-                        color: #FF5110;
+                        color: #fff;
                         font-weight: bold;
                     }
                 }

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

@@ -6,12 +6,13 @@
     <meta name="viewport"
         content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <title>星级厨房</title>
-
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/index.css?v=2.2">
 </head>
 
 <body>
+    <!-- 顶部返回 -->
+    <!-- <div class="back"><img src="./images/travel/back.png" alt=""></div> -->
     <div class="wrap no-in-app">
         <!-- <div class="wrap "> -->
         <div class="banner">
@@ -36,7 +37,7 @@
             <div class="recharge"><img src="./images/mall/recharge.png" alt=""></div>
         </div>
         <!-- 游戏区域 -->
-        <div class="game-area" style="display: none;">
+        <div class="game-area" >
             <!-- 本轮轮次 -->
             <div class="roundId"></div>
             <!-- 选择时间 -->
@@ -50,7 +51,86 @@
                     <div>10000</div>
                 </div>
                 <ul>
-
+                    <!-- <li class="li0" data-total-num="">
+                        <img src="./images/1.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li1" data-total-num="">
+                        <img src="./images/2.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li2" data-total-num="">
+                        <img src="./images/3.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li3" data-total-num="">
+                        <img src="./images/4.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li4" data-total-num="">
+                        <img src="./images/5.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li5" data-total-num="">
+                        <img src="./images/6.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li6" data-total-num="">
+                        <img src="./images/7.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li>
+                    <li class="li7" data-total-num="">
+                        <img src="./images/8.png" alt="">
+                        <div class="multiple"></div>
+                        <div class="name general"></div>
+                        <div class="bubble-2s">
+                            <p class="first-line">點擊選取</p>
+                            <p class="second-line">賺 <span></span> 倍獎勵</p>
+                        </div>
+                        <div class="select-num"></div>
+                    </li> -->
                 </ul>
 
                 <div class="shelf"><img src="./images/shelf.png" alt=""></div>
@@ -62,7 +142,7 @@
                 <div class="current-tip">等待结果</div>
             </div>
             <!-- 开奖展示动画时间 -->
-            <div class="draw-time">
+            <div class="draw-time" style="display: none;">
                 <div class="count-down">下一轮：<span class="count-down-num"></span>秒</div>
                 <div class="current-tip">本轮结果：<span class="current-result"></span></div>
                 <!-- 中奖物品展示 -->
@@ -189,14 +269,14 @@
                     <div class="qtsm">
                         <p class="title">其他說明</p>
                         如果以上說明未能解答您的疑問，請聯繫客服，會有專人解答疑難
-                        <p>本活動與蘋果公司無關</p>
+                        <p>本活動以及活動獎勵與Google/蘋果公司無關</p>
                     </div>
                 </main>
             </div>
         </div>
 
         <!-- 今日排名弹窗 -->
-        <div class="shade-mask-rank">
+        <div class="shade-mask-rank" >
             <div class="shade-content-rank">
                 <div class="rank-top">
 
@@ -245,7 +325,7 @@
     <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?v=2.2"></script>
+    <script src="./js/index.js?v=2.1"></script>
 </body>
 
 </html>

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

@@ -82,6 +82,7 @@ const getUserPieceNum = () => {
         success (res) {
             if (res.code === 200) {
                 $('.info-bottom').find('.fragment span').html(res.data.diamonds)
+                $('.wrap .info-bottom .info-wrap .diamond-num span').text(res.data.diamonds)
                 myFragment = res.data.diamonds;
             } else {
                 return toastMsg(res.message)
@@ -132,6 +133,7 @@ const getNewestAct = () => {
                     return showLoading('服務器正在維護中...')
                 } else {
                     console.log(res.timestamp > res.data.endTime);
+                    if (res.data.endTime == null) res.data.endTime = undefined
                     if (res.timestamp >= res.data.endTime) { //請求的還是上一輪的數據，重新請求
                         console.log('請求的還是上一輪的數據，必須重新請求');
                         showLoading()
@@ -454,10 +456,10 @@ const renderDrawInfo = () => {
     $('.wrap .game-area .draw-time .draw-pic').remove();
     var lenght = drawInfo.drawItemList.length;
     var drawStr = '';
-    drawInfo.drawItemList.forEach(res => {
+    drawInfo.drawItemList.forEach(item => {
         drawStr += `
         <div class="draw-pic">
-            <img src="${res.drawImageUrl}" alt="">
+            <img src="${item.drawName == '洋蔥' ? './images/1.png' : item.drawName == '番茄' ? './images/2.png' : item.drawName == '蘑菇' ? './images/3.png' : item.drawName == '土豆' ? './images/4.png' : item.drawName == '大閘蟹' ? './images/5.png' : item.drawName == '魚' ? './images/6.png' : item.drawName == '雞肉' ? './images/7.png' : item.drawName == '龍蝦' ? './images/8.png' : item.drawImageUrl}" alt="">
         </div>
         `
     })
@@ -503,13 +505,13 @@ const renderDrawInfo = () => {
     $('.put-wrap .list .item').remove()
     // 渲染投入列表
     let list = ''
-    drawInfo.userDrawResult.drawRecords.map(res => {
+    drawInfo.userDrawResult.drawRecords.map(item => {
         list += `
             <div class="item">
-                <p><img src="${res.imgUrl}" class="gift" alt=""></p>
+                <p><img src="${item.name == '洋蔥' ? './images/1.png' : item.name == '番茄' ? './images/2.png' : item.name == '蘑菇' ? './images/3.png' : item.name == '土豆' ? './images/4.png' : item.name == '大閘蟹' ? './images/5.png' : item.name == '魚' ? './images/6.png' : item.name == '雞肉' ? './images/7.png' : item.name == '龍蝦' ? './images/8.png' : item.imgUrl}" class="gift" alt=""></p>
                 <div>
                     <img src="./images/diamond.png" class="diamond" alt="">
-                    <span class="in">${res.costPieceNum}</span>
+                    <span class="in">${item.costPieceNum}</span>
                 </div>
             </div>
         `
@@ -608,10 +610,10 @@ const renderListItem = () => {
             `
         })
     } else {
-        listItem.map((item) => {
+        listItem.forEach((item, i) => {
             str += `
                 <li data-total-num={"number":"${item.costPieceNum}","id":"${item.id}"}>
-                    <img src="${item.imgUrl}" alt="">
+                    <img src="${item.name == '洋蔥' ? './images/1.png' : item.name == '番茄' ? './images/2.png' : item.name == '蘑菇' ? './images/3.png' : item.name == '土豆' ? './images/4.png' : item.name == '大閘蟹' ? './images/5.png' : item.name == '魚' ? './images/6.png' : item.name == '雞肉' ? './images/7.png' : item.name == '龍蝦' ? './images/8.png' : item.imgUrl}" alt="">
                     <div class="multiple">x${item.multiple}</div>
                     <div class="name">${item.name} <p class="gift-price">${item.price ? `(${item.price}鉆石)` : ''}</p></div>
                     <div class="bubble-2s">
@@ -669,13 +671,13 @@ const renderPreviousResults = (val) => {
             <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>`;
+                return `<p style="width:0.8rem;height:0.8rem"><img  src="${item.drawName == '洋蔥' ? './images/1.png' : item.drawName == '番茄' ? './images/2.png' : item.drawName == '蘑菇' ? './images/3.png' : item.drawName == '土豆' ? './images/4.png' : item.drawName == '大閘蟹' ? './images/5.png' : item.drawName == '魚' ? './images/6.png' : item.drawName == '雞肉' ? './images/7.png' : item.drawName == '龍蝦' ? './images/8.png' : 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>`;
+                return `<p style="width:0.6rem;height:0.6rem"><img  src="${item.drawName == '洋蔥' ? './images/1.png' : item.drawName == '番茄' ? './images/2.png' : item.drawName == '蘑菇' ? './images/3.png' : item.drawName == '土豆' ? './images/4.png' : item.drawName == '大閘蟹' ? './images/5.png' : item.drawName == '魚' ? './images/6.png' : item.drawName == '雞肉' ? './images/7.png' : item.drawName == '龍蝦' ? './images/8.png' : 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>`;
+                return `<p style="width:0.45rem;height:0.45rem"><img  src="${item.drawName == '洋蔥' ? './images/1.png' : item.drawName == '番茄' ? './images/2.png' : item.drawName == '蘑菇' ? './images/3.png' : item.drawName == '土豆' ? './images/4.png' : item.drawName == '大閘蟹' ? './images/5.png' : item.drawName == '魚' ? './images/6.png' : item.drawName == '雞肉' ? './images/7.png' : item.drawName == '龍蝦' ? './images/8.png' : item.drawImageUrl}" alt=""></p>`;
             } else {
-                return `<p><img style="width:0.3333333333rem;height:0.3333333333rem" src="${item.drawImageUrl}" alt=""></p>`;
+                return `<p><img style="width:0.3333333333rem;height:0.3333333333rem" src="${item.drawName == '洋蔥' ? './images/1.png' : item.drawName == '番茄' ? './images/2.png' : item.drawName == '蘑菇' ? './images/3.png' : item.drawName == '土豆' ? './images/4.png' : item.drawName == '大閘蟹' ? './images/5.png' : item.drawName == '魚' ? './images/6.png' : item.drawName == '雞肉' ? './images/7.png' : item.drawName == '龍蝦' ? './images/8.png' : item.drawImageUrl}" alt=""></p>`;
             }
 
         }).join('')
@@ -703,17 +705,19 @@ const sendUserDrawInfo = (itemId, num, tais) => {
                 tais.data('total-num').number = parseInt(tais.data('total-num').number) + fragmentNum
                 tais
                     .stop(true, true)
-                    .animate({ scale: 1.1 }, 200)
-                    .animate({ scale: 1 }, 200, function () {
-                        if (lock) {
-                            tais.find('.select-num').html('+' + tais.data('total-num').number).hide().fadeIn(200)
-                        }
-                        setTimeout(() => {
-                            // getUserInfo()
-                            getUserPieceNum()
-                            // getListItem(roundId)
-                        }, 100)
-                    })
+                    .animate({ scale: 1.1, }, 50)//skew(10deg, 10deg)
+                    .animate({ scale: 1, }, 50)//skew(10deg, 10deg) rotate: 0,
+                // .animate({ scale: 1, rotate: 0 }, 50, function () {
+                // if (lock) {
+                // tais.find('.select-num').html('+' + tais.data('total-num').number).hide().fadeIn(200)
+                tais.find('.select-num').html('+' + tais.data('total-num').number).hide().fadeIn(50)
+                // }
+                // setTimeout(() => {
+                // getUserInfo()
+                getUserPieceNum()
+                // getListItem(roundId)
+                // }, 100)
+                // })
                 hideLoading(layerIndex)
             } else if (31005) {
                 lock = !lock
@@ -1016,7 +1020,7 @@ $(function () {
         $('.recharge').click(function () {
             // if (browser.app) {
             //     if (browser.ios) {
-            //         window.location.href = 'https://api.pekolive.com/peko/modules/pay/index.html?channelType=4';
+            //         window.location.href = 'http://192.168.0.19:5502/view/peko/modules/pay/index.html?channelType=4';
             //     } else {
             //         if (browser.android) {
             //             let channel = pubInfo.deviceInfo.channel
@@ -1078,8 +1082,13 @@ $(function () {
                     window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
                 }
             } else if (browser.ios) {
-                window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
-                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+                let channel = pubInfo.deviceInfo.channel;
+                if (channel == "appstore") { 
+                    window.webkit.messageHandlers.openChargePage.postMessage(null);
+                } else {
+                    window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
+                    window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+                }
             }
         } else {
             toastMsg('請在app內打開')
@@ -1138,68 +1147,7 @@ $(function () {
     $('.shade-content-rank').on('click', function (e) {
         e.stopPropagation()
     })
-    // 監聽滾動
-    // $('.other-rank').on('scroll', function () {
-    //     let scrollTop = $(this).scrollTop();//這是已經卷進去滾動條的的高度
-    //     let scrollHeight = $('.other-rank')[0].scrollHeight;//這個是other-rank包含滾動條的總高度
-    //     let ulHeight = $(this).innerHeight();//這個是other-rank的高度
 
-    //     //這樣距離到底還有一段距離就請求，但是會導致重復請求，所以要加鎖限製
-    //     if (scrollTop + ulHeight + 100 >= scrollHeight) {
-    //         if (type === 1) {
-    //             if (isLockD) {
-    //                 isLockD = false
-    //                 pageD++
-    //                 if (pageSize * pageD > 30) {
-    //                     toastMsg('沒有更多數據啦~')
-    //                 } else {
-    //                     if (canRequsetNextPageD) {
-    //                         getListRank(type, pageD);
-    //                     } else {
-    //                         toastMsg('沒有更多數據啦~')
-    //                     }
-    //                 }
-    //             } else {
-    //                 if (scrollTop + ulHeight >= scrollHeight) {
-    //                     if (pageSize * pageD > 30) {
-    //                         toastMsg('沒有更多數據啦~')
-    //                     }
-    //                 }
-    //             }
-
-    //         } else {
-    //             if (isLockN) {
-    //                 isLockN = false
-    //                 pageN++
-    //                 if (pageSize * pageN > 30) {
-    //                     toastMsg('沒有更多數據啦~')
-    //                 } else {
-    //                     if (canRequsetNextPageN) {
-    //                         getListRank(type, pageN);
-    //                     } else {
-    //                         toastMsg('沒有更多數據啦')
-    //                     }
-    //                 }
-    //             } else {
-    //                 if (scrollTop + ulHeight >= scrollHeight) {
-    //                     if (pageSize * pageN > 30) {
-    //                         toastMsg('沒有更多數據啦~')
-    //                     }
-    //                 }
-    //             }
-    //         }
-    //     }
-    // })
-
-    // 播放3s動畫
-    // let player1 = new SVGA.Player('.draw-time');
-    // let parser1 = new SVGA.Parser('.draw-time');
-    // parser1.load('./images/draw.svga', function (videoItem) {
-    //     // player.loops = 2;
-    //     player1.clearsAfterStop = false;
-    //     player1.setVideoItem(videoItem);
-    //     player1.startAnimation();
-    // })
     // 点击跳转个人主页
     // $('.draw-time .top-three .top-three-list .no').off()
     $('.draw-time .top-three .top-three-list .no').click(function () {
@@ -1231,8 +1179,13 @@ $(function () {
                     window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
                 }
             } else if (browser.ios) {
-                window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
-                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+                let channel = pubInfo.deviceInfo.channel;
+                if (channel == "appstore") { 
+                    window.webkit.messageHandlers.openChargePage.postMessage(null);
+                } else {
+                    window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
+                    window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+                }
             }
         } else {
             toastMsg('請在app內打開')
@@ -1252,27 +1205,27 @@ $(function () {
             return
         }
 
-        if (!lock) {
-            lock = !lock
-            // console.log($(this).data('total-num'));
-            // console.log($(this).data('total-num').number);
-            // console.log(fragmentNum);
-            // $(this).data('total-num').number = parseInt($(this).data('total-num').number) + fragmentNum
-            // $(this)
-            //     .stop(true, true)
-            //     .animate({ scale: 1.1 }, 200)
-            //     .animate({ scale: 1 }, 200, function () {
-            //         if (lock) {
-            //             $(this).find('.select-num').html('+' + $(this).data('total-num').number).hide().fadeIn(200)
-            //         }
-            //         setTimeout(() => {
-            //             // getUserInfo()
-            //             getUserPieceNum()
-            //             // getListItem(roundId)
-            //         }, 100)
-            //     })
-            sendUserDrawInfo($(this).data('total-num').id, fragmentNum, $(this))
-        }
+        // if (!lock) {
+        //     lock = !lock
+        // console.log($(this).data('total-num'));
+        // console.log($(this).data('total-num').number);
+        // console.log(fragmentNum);
+        // $(this).data('total-num').number = parseInt($(this).data('total-num').number) + fragmentNum
+        // $(this)
+        //     .stop(true, true)
+        //     .animate({ scale: 1.1 }, 200)
+        //     .animate({ scale: 1 }, 200, function () {
+        //         if (lock) {
+        //             $(this).find('.select-num').html('+' + $(this).data('total-num').number).hide().fadeIn(200)
+        //         }
+        //         setTimeout(() => {
+        //             // getUserInfo()
+        //             getUserPieceNum()
+        //             // getListItem(roundId)
+        //         }, 100)
+        //     })
+        sendUserDrawInfo($(this).data('total-num').id, fragmentNum, $(this))
+        // }
     })
 
     // ios去到後臺或者鎖屏後再回來倒計時不準確
@@ -1294,7 +1247,8 @@ $(function () {
             $countDown.html(countDownTime)
         }
     })
-})  
+
+})
 //返回页面 重新请求接口
 var hiddenProperty = 'hidden' in document ? 'hidden' :
     'webkitHidden' in document ? 'webkitHidden' :
@@ -1306,4 +1260,4 @@ var onVisibilityChange = function () {
         location.reload()
     }
 }
-document.addEventListener(visibilityChangeEvent, onVisibilityChange);
+document.addEventListener(visibilityChangeEvent, onVisibilityChange);

view/peko/activity/annualCelebration/wish.html

@@ -76,7 +76,7 @@
         <div class="tab2_contain">
             <div class="rule_wrap">
                 <p class="rule_item">
-                    活动期间，每日登录pekoApp即可免费获赠一个魔法棒（每台设备每日限一次）
+                    活动期间，每日登录pikoApp即可免费获赠一个魔法棒（每台设备每日限一次）
                 </p>
             </div>
             <div class="panel_wrap">

view/peko/activity/channel-new/index.html

@@ -6,7 +6,7 @@
   <meta name="viewport"
     content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-  <title>peko</title>
+  <title>piko</title>
 
   <link rel="stylesheet" href="./css/reset.css">
   <link rel="stylesheet" href="./css/index.css">
@@ -22,7 +22,7 @@
     <div class="button2-wrapper download">
     </div>
     <div class="eori">
-      <div class="weixin-name">peko客服微信：pekokefu01</div>
+      <div class="weixin-name">piko客服微信：pikokefu01</div>
       <p>粤网文:(2018)8220-2981号</p>
       <p class="recordfoot">
         <i class="record"></i>

view/peko/activity/channel/index.html

@@ -25,7 +25,7 @@
   <meta name="msapplication-tap-highlight" content="no">
   <meta name="apple-mobile-web-app-capable" content="no" />
   <meta name="format-detection" content="telephone=no">
-  <title>peko</title>
+  <title>piko</title>
 
   <!-- <link rel="stylesheet" href="./home/css/reset.css"> -->
   <link rel="stylesheet" href="./css/reset.css">
@@ -47,7 +47,7 @@
       <!--<a href="javascript:void(0)" class="jumpUrl"><img src="./home/images/pc/iosBtn.png" alt=""></a>-->
     </div>
     <div class="eori">
-      <div class="weixin-name">peko客服微信：pekokefu01</div>
+      <div class="weixin-name">piko客服微信：pikokefu01</div>
       <p>粤网文:(2018)8220-2981号</p>
       <p class="recordfoot">
         <i class="record"></i>

view/peko/activity/explore_abandon/index.html

@@ -5,7 +5,7 @@
   <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>探索peko</title>
+  <title>探索piko</title>
 
   <!-- <%- include('../html_tpl/style.html') %> -->
   <link rel="stylesheet" href="./css/index.css">

view/peko/activity/first_anniversary/js/time_cinema.js

@@ -36,7 +36,7 @@ let shareObj = {
     type: 2,
     data: {
         msg: 'llllll',
-        title: '我的peko一周年报告',
+        title: '我的piko一周年报告',
         imgUrl: 'https://beta.api.pekolive.com/peko/modules/wxPubPay/images/logo.png',
         desc: '我的专属称号竟然是这样的！快来试试你的~',
     }

view/peko/activity/first_anniversary/time_cinema.html

@@ -19,7 +19,7 @@
                 <h3>嗨，鹅宝</h3>
                 <p class="p1">还记得<span><b></b><b></b><b></b></span></p>
                 <p>我们第一次相遇</p>
-                <p>截止目前peko已陪伴你<span class="sp1"></span>天~</p>
+                <p>截止目前piko已陪伴你<span class="sp1"></span>天~</p>
             </div>
             <div class="touchBox">
                 <img src="./images/time_cinema/touch.png" alt="">
@@ -29,7 +29,7 @@
         <div class="bg bg2">
             <div class="text">
                 <h3>过去的一年</h3>
-                <p>你有<span class="sp1">2222222</span>天都在peko里畅游</p>
+                <p>你有<span class="sp1">2222222</span>天都在piko里畅游</p>
                 <p>累计登入<span class="sp2">22222222</span>次</p>
                 <p>你一共探索了<span class="sp3">2222</span>个房间</p>
                 <p>其中<span class="sp4">ID:5200</span>的房间陪伴你最久</p>
@@ -79,7 +79,7 @@
         <div class="bg bg5">
             <div class="text">
                 <p>无论未来如何</p>
-                <p>希望peko还能陪伴你度过岁岁年年~</p>
+                <p>希望piko还能陪伴你度过岁岁年年~</p>
                 <p>在此授予你:</p>
                 <h3><span>XXXX</span>称号</h3>
             </div>

view/peko/activity/goHouseRewards/index.html

@@ -13,7 +13,7 @@
     <div class="content"></div>
     <div class="activityReward"></div>
     <div class="but"></div>
-    <div class="text">该活动最终解释权归peko平台所有</div>
+    <div class="text">该活动最终解释权归piko平台所有</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>

view/peko/activity/goHouseRewards/qiwang.html

@@ -4,7 +4,7 @@
     <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>peko棋王杯</title>
+    <title>piko棋王杯</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/qiwang.css">
 </head>

view/peko/activity/goHouseRewards/qixi.html

@@ -13,7 +13,7 @@
     <div class="content"></div>
     <div class="activityReward"></div>
     <div class="but"></div>
-    <div class="text">该活动最终解释权归peko平台所有</div>
+    <div class="text">该活动最终解释权归piko平台所有</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>

view/peko/activity/goodLuckCard/index.html

@@ -126,7 +126,7 @@
             <li><span>1</span>集齐所有福卡即可获得瓜分奖池的机会，瓜分金额随机，集齐次数越多，瓜分次数越多，瓜分奖励统一一次发放至账户</li>
             <li><span>2</span>瓜分奖励时间：<p class="tip">2月12日0点至2月15日0点</p></li>
             <li><span>3</span>获得敬业福需找客服报备赠送对应的装扮，赠送次数不叠加，每人仅限报备一次装扮</li>
-            <li><span>4</span>有任何疑问可添加官方客服<p class="tip">（pekokefu01）</p>进行咨询</li>
+            <li><span>4</span>有任何疑问可添加官方客服<p class="tip">（pikokefu01）</p>进行咨询</li>
         </ul>
     </div>
     <!-- 尾部图片 -->

view/peko/activity/invitation/js/index.js

@@ -32,7 +32,7 @@ let shareObj = {
     type: 2,
     data: {
         msg: 'llllll',
-        title: '上peko，开黑交友玩游戏',
+        title: '上piko，开黑交友玩游戏',
         imgUrl: 'https://api.pekolive.com/peko/modules/wxPubPay/images/logo.png',
         desc: '邀请好友得金铲铲豪华大礼，快来加入吧！',
     }
@@ -48,8 +48,8 @@ const getInviteList = () => {
             if(res.code === 200){
                 userInfo = res.data.inviteUser
 
-                if(pubInfo.deviceInfo.app == 'pekoEnterprise'){
-                    shareObj.data.link = shareObj.data.showUrl = `${urlPrefix}/peko/modules/game/register.html?inviteCode=` + res.data.inviteCode + '&shareUid=' + userInfo.uid + '&enterprise=pekoEnterprise'
+                if(pubInfo.deviceInfo.app == 'pikoEnterprise'){
+                    shareObj.data.link = shareObj.data.showUrl = `${urlPrefix}/peko/modules/game/register.html?inviteCode=` + res.data.inviteCode + '&shareUid=' + userInfo.uid + '&enterprise=pikoEnterprise'
                 }else{
                     shareObj.data.link = shareObj.data.showUrl = `${urlPrefix}/peko/modules/game/register.html?inviteCode=` + res.data.inviteCode + '&shareUid=' + userInfo.uid
                 }

view/peko/activity/lol-drainage/index.html

@@ -30,7 +30,7 @@
     </div>
     <!-- 我的豆子 -->
     <div class="w_myBeans">
-        <p>每成功邀请一位新人好友，即可获得200金豆好友下载peko并登录，金豆即刻到账</p>
+        <p>每成功邀请一位新人好友，即可获得200金豆好友下载piko并登录，金豆即刻到账</p>
         <span>我的金豆：<b></b> <i>刷新 <img src="./images/refresh.png" alt=""></i></span>
     </div>
     <!-- tab 切换 -->
@@ -96,7 +96,7 @@
         <div class="z_user_info">
             <img src="" alt="" class="z_user_avatar">
             <p>
-                <span class="z_user_nick">peko</span>  
+                <span class="z_user_nick">piko</span>  
                 <span class="z_user_erban">ID：666666</span>  
             </p>
             <span class="z_user_bonus">总获得：<span>0</span>金豆</span>
@@ -108,7 +108,7 @@
         <div class="z_content">
             <p class="z_title">兑换成功</p>
             <img src="./images/350.png" alt="" class="z_award_pic">
-            <p class="z_award_name">peko新用户游戏激励金3.8元</p>
+            <p class="z_award_name">piko新用户游戏激励金3.8元</p>
             <p class="z_award_get_way">已放入我的装扮</p>
             <img src="./images/know-btn.png" alt="" class="z_know">
         </div>

view/peko/activity/lol-drainage/js/index.js

@@ -7,7 +7,7 @@ let w_link;
 let share = {
     title: '英雄联盟手游皮肤免费送！！',
     // link: link,
-    desc: '来peko，更有丰厚游戏激励金等你来~',
+    desc: '来piko，更有丰厚游戏激励金等你来~',
     imgUrl: 'https://api.pekolive.com/peko/modules/wxPubPay/images/logo.png'
 }
 let shareObj = {
@@ -141,13 +141,13 @@ const awardObj = [
         pic: './images/nameplate.png'
     },
     {
-        name: 'peko新用户游戏激励金3.8元',
-        desc: 'peko新用户游戏<br>激励金3.8元',
+        name: 'piko新用户游戏激励金3.8元',
+        desc: 'piko新用户游戏<br>激励金3.8元',
         pic: './images/cash.png'
     },
     {
-        name: 'peko新用户游戏激励金5.8元',
-        desc: 'peko新用户游戏<br>激励金5.8元',
+        name: 'piko新用户游戏激励金5.8元',
+        desc: 'piko新用户游戏<br>激励金5.8元',
         pic: './images/cash.png'
     },
     {

view/peko/activity/planet/index.html

@@ -10,7 +10,7 @@
 </head>
 <body>
     <div class="lead">
-        <p>peko的小可爱们~</p>
+        <p>piko的小可爱们~</p>
         <p>快来踏上星际探索的旅途吧</p>
         <p>送出小星球可探索到各个星球的物资</p>
         <p>最高可探索到7777鉆的礼物哦~</p>

view/peko/activity/popular-anchor-plan/index.html

@@ -204,7 +204,7 @@
                     <div class="explain">
                         1.若出现挂机三次及以上，则取消参与活动资格。</br> 
                         2.奖励将于三个工作日内发放。 </br>
-                        3.活动最终解释权归peko所有。 
+                        3.活动最终解释权归piko所有。 
                     </div>
                     <div class="code">
                         <img src="./images/wx_code.jpg" alt="">

view/peko/activity/recruit/index.html

@@ -5,7 +5,7 @@
   <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>peko公会招募令</title>
+  <title>piko公会招募令</title>
   <style>
     img {
       width: 100%;

view/peko/activity/recruit/js/index.js

@@ -5,11 +5,11 @@ var info = {};
 var betaUrl = 'https://beta.api.pekolive.com/peko/activity/recruit/index.html';
 var realUrl = tranUrl + '/peko/activity/recruit/index.html';
 var share = {
-  title: 'peko公会招募令',
+  title: 'piko公会招募令',
   link: tranUrl + '/peko/activity/recruit/index.html',
   // imgUrl: 'https://img.letusmix.com/new_logo.png',
   imgUrl: 'https://api.pekolive.com/peko/modules/wxPubPay/images/logo.png',
-  desc: 'peko公会招募令',// 分享描述
+  desc: 'piko公会招募令',// 分享描述
 };
 if (EnvCheck() == 'test') {
   var vConsole = new VConsole();

view/peko/activity/ticketsPackage/index.html

@@ -3,7 +3,7 @@
 <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>peko</title>
+    <title>piko</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/index.css?v=2.0">
 </head>
@@ -21,7 +21,7 @@
             <p class="ticket-left-num">当前剩余：<span>0</span>张</p>
         </div>
         <div class="form-wrap">
-            <input type="text" placeholder="输入注册peko的手机号" class="mobile-number" maxlength="11" id="mobile-number">
+            <input type="text" placeholder="输入注册piko的手机号" class="mobile-number" maxlength="11" id="mobile-number">
             <div class="verify-wrap">
                 <input type="text" placeholder="输入验证码" class="verify-ipt" id="verify-ipt">
                 <p class="verify-btn">获取验证码</p>
@@ -38,7 +38,7 @@
         <p class="huode">获得</p>
         <img alt="">
         <p class="ticket-name"></p>
-        <p class="tip1">快去peko参赛赢赏金吧~</p>
+        <p class="tip1">快去piko参赛赢赏金吧~</p>
         <a class="success-btn">去参赛>></a>
     </div>
 
@@ -51,7 +51,7 @@
 
     <div class="bottom">
         <img src="./images/logo.png" alt="">
-        <p>来peko打游戏，争夺更多赏金！</p>
+        <p>来piko打游戏，争夺更多赏金！</p>
         <a class="download">下载APP</a>
     </div>
 

view/peko/activity/ticketsPackage/invalid.html

@@ -3,7 +3,7 @@
 <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>peko</title>
+    <title>piko</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/invalid.css">
 </head>

view/peko/activity/ticketsPackage/js/index.js

@@ -49,12 +49,12 @@ const getTicketDetail = () => {
                 if(browser.android){
                     options = {
                         scheme: {
-                            protocol: 'pekoapp',
+                            protocol: 'pikoapp',
                             host: 'linkedme'
                         },
                         intent: {
-                            package: 'com.mango.peko',
-                            scheme: 'pekoapp',
+                            package: 'com.mango.piko',
+                            scheme: 'pikoapp',
                         },
                         universal: {
                             host: 'api.zhongjialx.com',
@@ -118,7 +118,7 @@ const getCode = (mobile) => {
     showLoading()
     $.ajax({
         type: 'POST',
-        url: urlPrefix + '/sms/getCode?app=peko',
+        url: urlPrefix + '/sms/getCode?app=piko',
         data: {
             mobile,
             type: 1
@@ -181,8 +181,8 @@ const drawTicket = (params) => {
                 $('.index-wrap').hide()
                 $('.success-wrap').show()
             } else if (res.code === 230003) {
-                $('.shade-content .title').html('该手机号未注册pekoApp<br>无法领取门票')
-                $('.shade-content .content-tip').html('请先前往pekoApp完成注册再来领取哦~')
+                $('.shade-content .title').html('该手机号未注册pikoApp<br>无法领取门票')
+                $('.shade-content .content-tip').html('请先前往pikoApp完成注册再来领取哦~')
                 $('.shade-content .content-btn').html('去APP内注册>>')
                 $('.shade-mask').show()
             } else if (res.code === 230004) {

view/peko/common/js/common.js

@@ -124,7 +124,7 @@ function checkVersion() {
         webApp: u.indexOf('Safari') > -1, //是否web应该程序，没有头部与底部
         weixin: u.indexOf('MicroMessenger') > -1, //是否微信
         qq: u.match(/\sQQ/i) == " qq", //是否QQ
-        pekoApp: u.match('pekoApp'),
+        pikoApp: u.match('pikoApp'),
         app: u.match('tutuApp') //是否在app内
     };
 }

view/peko/common/js/common2.js

@@ -529,11 +529,13 @@ function getInfoFromClient () {
         console.log('从客户端获取了用户信息（设备信息），此信息来源：common2.js');
         if (browser.android) {
             pubInfo.uid = methodsFromClient.uid.android();
+            pubInfo.roomUid = methodsFromClient.roomUid.android();
             pubInfo.ticket = methodsFromClient.ticket.android();
             pubInfo.deviceId = methodsFromClient.deviceId.android();
             pubInfo.deviceInfo = methodsFromClient.deviceInfo.android();
         } else {
             methodsFromClient.uid.ios();
+            methodsFromClient.roomUid.ios();
             methodsFromClient.ticket.ios();
             methodsFromClient.deviceId.ios();
             methodsFromClient.deviceInfo.ios();
@@ -541,15 +543,13 @@ function getInfoFromClient () {
 
     } else {
         // 非app环境调试参数
-        pubInfo.uid = 0;
-        pubInfo.ticket = "";
-        // pubInfo.uid = "";
-        // pubInfo.ticket = "";
-
+        pubInfo.uid = sessionStorage.getItem("uid") ? sessionStorage.getItem("uid") : '';
+        // pubInfo.ticket = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
+        pubInfo.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
         pubInfo.deviceId = "0";
         pubInfo.deviceInfo = {
             app: 'peko',
-            appVersion: '0.0.0',
+            appVersion: '9.9.9',
             os: '0.0.0',
             osVersion: '0.0.0',
             channel: 'browser',
@@ -764,19 +764,22 @@ function networkRequest (reqObj = {}, type) {
     if (typeof pubInfo.deviceInfo === 'string') {
         pubInfo.deviceInfo = JSON.parse(pubInfo.deviceInfo);
     };
-    const pubHeader = {
-        app: type != 'yinbaos' ? pubInfo.deviceInfo.app : 'yinbao',
-        // app: 'peko',
-        // app: pubInfo.deviceInfo.app.indexOf('peko') != -1 ? 'peko' : 'PlanetStar',
-        appVersion: pubInfo.deviceInfo.appVersion || '',
-        os: pubInfo.deviceInfo.os || '',
-        os_version: pubInfo.deviceInfo.osVersion || '',
-        channel: pubInfo.deviceInfo.channel || '',
-        client: 'h5',
-        pub_uid: pubInfo.uid,
-        pub_ticket: pubInfo.ticket
-    };
-
+    var browser = checkVersion();
+    const pubHeader = {};
+    pubHeader.app = type != 'yinbaos' ? pubInfo.deviceInfo.app : 'yinbao'
+    // app: 'piko',
+    // app: pubInfo.deviceInfo.app.indexOf('piko') != -1 ? 'piko' : 'PlanetStar',
+    pubHeader.appVersion = pubInfo.deviceInfo.appVersion || ''
+    pubHeader.os = pubInfo.deviceInfo.os || ''
+    pubHeader.os_version = pubInfo.deviceInfo.osVersion || ''
+    pubHeader.channel = pubInfo.deviceInfo.channel || ''
+    pubHeader.client = 'h5'
+    pubHeader.pub_uid = window.location.pathname.match(/login.html/) ? 0 : pubInfo.uid
+    if (browser.app) {
+        pubHeader.pub_ticket = pubInfo.ticket
+    } else {
+        pubHeader.h5_token =sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
+    }
     const url = reqObj.url;
     const commParams = objToParam(pubHeader);
     if (url.indexOf('?') >= 0) {
@@ -792,4 +795,13 @@ function networkRequest (reqObj = {}, type) {
 
     const response = $.ajax(reqObj);
     return response;
+}
+// 控制body是否可以滑动
+function bodyScroolFun (bool) {
+    if (bool) {
+        $('body').css('overflow', 'hidden');
+    } else {
+        $('body').css('overflow', 'auto');
+
+    }
 }

view/peko/home-yinyou/index.html

@@ -25,7 +25,7 @@
     <meta name="msapplication-tap-highlight" content="no">
     <meta name="apple-mobile-web-app-capable" content="no" />
     <meta name="format-detection" content="telephone=no">
-    <title>peko</title>
+    <title>piko</title>
 
     <!-- <link rel="stylesheet" href="./home/css/reset.css"> -->
     <link rel="stylesheet" href="./css/reset.css">

view/peko/home-yinyou/js/index.js

@@ -5,18 +5,18 @@ let urlData = getQueryString()
 let channelData = urlData.channel
 //定义官方渠道包
 const channelDict = {
-  'peko0': 'https://image.lecheng163.com/peko_peko0.apk',
-  'peko1': 'https://image.lecheng163.com/peko_peko1.apk',
-  'peko2': 'https://image.lecheng163.com/peko_peko2.apk',
-  'peko3': 'https://image.lecheng163.com/peko_peko3.apk',
-  'peko4': 'https://image.lecheng163.com/peko_peko4.apk',
-  'peko5': 'https://image.lecheng163.com/peko_peko5.apk',
-  'peko6': 'https://image.lecheng163.com/peko_peko6.apk',
-  'peko7': 'https://image.lecheng163.com/peko_peko7.apk',
-  'peko8': 'https://image.lecheng163.com/peko_peko8.apk',
-  'peko9': 'https://image.lecheng163.com/peko_peko9.apk',
-  'peko10': 'https://image.lecheng163.com/peko_peko10.apk',
-  'gongzhonghao': 'https://image.lecheng163.com/peko_gongzhonghao.apk',
+  'piko0': 'https://image.lecheng163.com/piko_piko0.apk',
+  'piko1': 'https://image.lecheng163.com/piko_piko1.apk',
+  'piko2': 'https://image.lecheng163.com/piko_piko2.apk',
+  'piko3': 'https://image.lecheng163.com/piko_piko3.apk',
+  'piko4': 'https://image.lecheng163.com/piko_piko4.apk',
+  'piko5': 'https://image.lecheng163.com/piko_piko5.apk',
+  'piko6': 'https://image.lecheng163.com/piko_piko6.apk',
+  'piko7': 'https://image.lecheng163.com/piko_piko7.apk',
+  'piko8': 'https://image.lecheng163.com/piko_piko8.apk',
+  'piko9': 'https://image.lecheng163.com/piko_piko9.apk',
+  'piko10': 'https://image.lecheng163.com/piko_piko10.apk',
+  'gongzhonghao': 'https://image.lecheng163.com/piko_gongzhonghao.apk',
   'zhaohui': 'https://image.lecheng163.com/zhaohui.apk'
   
   // 'baomihua01': 'https://image.lecheng163.com/accompany_release_v_213_1_baomihua01_sign.apk'
@@ -25,7 +25,7 @@ $(function () {
   let version = checkVersion()
   //判断url参数是否是与渠道包名一致
   let androidUrl = null;
-  channelDict.hasOwnProperty(channelData) ? androidUrl = channelDict[channelData] : androidUrl = 'https://image.lecheng163.com/peko_official.apk';
+  channelDict.hasOwnProperty(channelData) ? androidUrl = channelDict[channelData] : androidUrl = 'https://image.lecheng163.com/piko_official.apk';
   let iosUrl = 'http://doudouyue.com/8axv'   //ios企业包
 //   let iosUrl = 'https://apps.apple.com/cn/app/id1571083482'   //ios商店包
   

view/peko/home-yinyou/support.html

@@ -3,7 +3,7 @@
 <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>peko技术服务支持</title>
+    <title>piko技术服务支持</title>
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/index.css">
     <style>