寻爱之旅：充值跳转问题

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: pikoyuyin)</div> -->
+            <!-- <div class="tips">*情人节限定5位靓号:52XXX（XXX为随机数字，一组为2个靓号，<br>联系客服领取：LINE: pekoyuyin)</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: pikoyuyin)`)
+                        $('.gx .gx_in .tips').html(`*情人節限定5位靚號:52XXX（XXX為隨機數字，一組為2個靚號，<br>聯系客服領取：LINE: pekoyuyin)`)
                         $('.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">
-                    活动期间，每日登录pikoApp即可免费获赠一个魔法棒（每台设备每日限一次）
+                    活动期间，每日登录pekoApp即可免费获赠一个魔法棒（每台设备每日限一次）
                 </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 ? 'piko值:' + unitProcessing(res.data.userRank.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.data.userRank.rankValue, 10000, 1, 'w'));
+                $('.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) {
@@ -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 ? 'piko值:' + unitProcessing(res.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.rankValue, 10000, 1, 'w'));
+                    $(`.page3 .list .top${index + 1} p`).text(comeFrom == 1 ? 'peko值:' + 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 ? 'piko值:' + unitProcessing(res.rankValue, 10000, 1, 'w') : '魅力值:' + unitProcessing(res.rankValue, 10000, 1, 'w')}</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);

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

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

@@ -11,26 +11,9 @@
 html,
 body {
   font-family: "din-medium";
-  background: #E17E3D;
+  background: #C8864C;
   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%;
@@ -39,14 +22,6 @@ body::-webkit-scrollbar {
 }
 .wrap .banner {
   width: 100%;
-  position: relative;
-}
-.wrap .banner .subtitle {
-  position: absolute;
-  top: 0.12rem;
-  right: 1.12rem;
-  width: 1.8666666667rem;
-  height: 1.12rem;
 }
 .wrap .rule,
 .wrap .record {
@@ -64,79 +39,46 @@ body::-webkit-scrollbar {
 .wrap .record {
   top: 2.8533333333rem;
 }
-.wrap .previous_Round_Result {
-  width: 9.4266666667rem;
-  height: 1.52rem;
+.wrap .previous-result {
   position: absolute;
-  top: 16.1rem;
+  top: 14.9333333333rem;
   left: 50%;
   transform: translateX(-50%);
-  background: url(../images/previous_Round_Result.png) no-repeat;
-  background-size: 100% 100%;
+  width: 9.4666666667rem;
+  height: 0.9066666667rem;
+  font-family: "pingfang-bold";
+  font-size: 0.4rem;
+  font-weight: bold;
+  color: white;
+  display: flex;
+  align-items: center;
+  background: url("../images/previous-result-bg.png") no-repeat 0 0/100% 100%;
   z-index: 9;
 }
-.wrap .previous_Round_Result span {
-  color: #fff;
-  position: absolute;
+.wrap .previous-result span {
   font-weight: bold;
   margin-left: 0.36rem;
   text-shadow: 1px 1px 0px #fc8321, -1px -1px 0px #fc8321, 1px 1px 0px #fc8321, -1px -1px 0px #fc8321, 1px 1px 0px #fc8321, -1px -1px 0px #fc8321;
-  font-size: 0.48rem;
-  left: 0rem;
-  bottom: 1.65rem;
-  background: url(../images/wljg.png) no-repeat;
-  background-size: 100% 100%;
-  width: 1.7066666667rem;
-  height: 0.5066666667rem;
-  position: absolute;
 }
-.wrap .previous_Round_Result .box {
-  width: 9.4266666667rem;
-  height: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-  box-sizing: border-box;
-  padding: 0.2533333333rem 0.1333333333rem 0 0.1333333333rem;
-  overflow-x: scroll;
-}
-.wrap .previous_Round_Result .box::-webkit-scrollbar {
-  height: 2px;
-  display: none;
-}
-.wrap .previous_Round_Result .box ul {
-  width: 35rem;
-  height: 100%;
-}
-.wrap .previous_Round_Result .box ul li {
-  float: left;
-  width: 1.6266666667rem;
-  height: 0.9733333333rem;
-  background: url(../images/previous_Round_Result_Li.png) no-repeat;
-  background-size: 100% 100%;
+.wrap .previous-result .result-list {
   display: flex;
-  justify-content: space-around;
-  flex-wrap: wrap;
-  box-sizing: border-box;
-  align-items: center;
-  margin-right: 0.1066666667rem;
 }
-.wrap .previous_Round_Result .box ul li p {
-  display: block;
-  width: 0.3333333333rem;
-  height: 0.3333333333rem;
-  background: url(../images/record_bubble.png) no-repeat;
-  background-size: 100% 100%;
-  position: relative;
-  margin: 0 0.0266666667rem;
+.wrap .previous-result .result-list p {
+  width: 0.5333333333rem;
+  height: 0.5333333333rem;
+  margin-left: 0.1066666667rem;
+  background: url("../images/little-bubble.png") 0 0/100% 100%;
 }
-.wrap .previous_Round_Result .box ul li p img {
-  display: block;
-  width: 80%;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
+.wrap .previous-result .result-list p img {
+  width: 100%;
+}
+.wrap .previous-result .more-result {
+  width: 0.56rem;
+  height: 0.5866666667rem;
+  margin-left: 0.2rem;
+}
+.wrap .previous-result .more-result img {
+  width: 100%;
 }
 .wrap .mall {
   position: absolute;
@@ -198,7 +140,6 @@ body::-webkit-scrollbar {
   padding-left: 0.6266666667rem;
 }
 .wrap .game-area .select-time ul li {
-  transition: all, 0.2s;
   position: relative;
   z-index: 99;
   width: 1.84rem;
@@ -360,37 +301,16 @@ body::-webkit-scrollbar {
   background: url("../images/tip.png") no-repeat 0 0/100% 100%;
   text-align: center;
   font-size: 0.2933333333rem;
-  color: #FFF0C799;
+  color: rgba(255, 240, 199, 0.6);
   font-weight: bold;
 }
-.wrap .game-area .wait-time-s {
-  width: 10rem;
-  height: 9.0666666667rem;
-  position: absolute;
-  top: 1.5rem;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 5;
-}
-.wrap .game-area .wait-time-x {
-  width: 10rem;
-  height: 9.0666666667rem;
-  position: absolute;
-  top: 1.4rem;
-  left: 50%;
-  transform: translateX(-50%);
-}
 .wrap .game-area .draw-time {
   display: none;
-  width: 55%;
+  width: 2.8rem;
   height: 2.84rem;
-  margin: 1.8rem auto 0.2rem;
+  margin: 1.2rem auto 0.2rem;
+  background: url("../images/drawBg.png");
   background-size: 100% 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-flow: row wrap;
-  box-sizing: border-box;
 }
 .wrap .game-area .draw-time .count-down,
 .wrap .game-area .draw-time .current-tip {
@@ -421,7 +341,7 @@ body::-webkit-scrollbar {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 2.3rem;
+  bottom: 3.1rem;
   width: 100%;
   height: 4rem;
 }
@@ -471,18 +391,13 @@ body::-webkit-scrollbar {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no1 .nick {
   width: 100%;
-  height: 1rem;
-  line-height: 0.6rem;
   font-size: 0.2933333333rem;
   color: #fff;
   text-align: center;
   position: absolute;
-  top: 1.1333333333rem;
+  top: 1.1733333333rem;
   left: 50%;
   transform: translateX(-50%);
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no1 .num {
   width: 100%;
@@ -528,18 +443,13 @@ body::-webkit-scrollbar {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no2 .nick {
   width: 100%;
-  height: 1rem;
-  line-height: 0.6rem;
   font-size: 0.2933333333rem;
   color: #fff;
   text-align: center;
   position: absolute;
-  top: 0.9333333333rem;
+  top: 1.0133333333rem;
   left: 50%;
   transform: translateX(-50%);
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no2 .num {
   width: 100%;
@@ -586,18 +496,13 @@ body::-webkit-scrollbar {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no3 .nick {
   width: 100%;
-  height: 1rem;
-  line-height: 0.6rem;
   font-size: 0.2933333333rem;
   color: #fff;
   text-align: center;
   position: absolute;
-  top: 0.9333333333rem;
+  top: 1.0133333333rem;
   left: 50%;
   transform: translateX(-50%);
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no3 .num {
   width: 100%;
@@ -616,20 +521,15 @@ body::-webkit-scrollbar {
   color: #fff;
 }
 .wrap .game-area .draw-time .draw-pic {
-  z-index: 1;
-  width: 1.3466666667rem;
-  height: 1.3466666667rem;
-  margin: 0 auto 0;
-  background: url("../images/drawBg.png") no-repeat;
-  background-size: 100% 100%;
-  position: relative;
-}
-.wrap .game-area .draw-time .draw-pic img {
-  width: 0.8rem;
   position: absolute;
   left: 50%;
-  top: 45%;
-  transform: translate(-50%, -50%);
+  transform: translateX(-50%);
+  top: 1.65rem;
+  z-index: 1;
+  width: 1.3333333333rem;
+}
+.wrap .game-area .draw-time .draw-pic img {
+  width: 100%;
 }
 .wrap .game-area .draw-time .award-info {
   width: 8rem;
@@ -637,7 +537,7 @@ body::-webkit-scrollbar {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 7.2rem;
+  top: 6.5rem;
   display: flex;
 }
 .wrap .game-area .draw-time .award-info .desc {
@@ -663,7 +563,7 @@ body::-webkit-scrollbar {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 4.5rem;
+  top: 3.8rem;
   display: flex;
 }
 .wrap .game-area .draw-time .put-wrap .put {
@@ -843,38 +743,36 @@ body::-webkit-scrollbar {
   width: 8.8rem;
   height: 13.0666666667rem;
   background: white;
-  background: url(../images/myBoxBg.png) no-repeat;
-  background-size: 100% 100%;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top {
   height: 4.5333333333rem;
+  background-image: linear-gradient(#F49C35, #FFDD81);
   overflow: hidden;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap {
   font-family: "pingfang-regular";
-  width: 5.8666666667rem;
+  width: 6.1333333333rem;
   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: 50%;
+  width: 2.8rem;
   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: #F56801;
+  color: #F5A03A;
   border-radius: 0.4rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap {
@@ -896,8 +794,8 @@ body::-webkit-scrollbar {
   display: none;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar {
-  width: 2.5866666667rem;
-  height: 2.5066666667rem;
+  width: 1.76rem;
+  height: 2.3333333333rem;
   margin-bottom: 0.2666666667rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar p {
@@ -910,9 +808,8 @@ body::-webkit-scrollbar {
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar img {
   position: relative;
   z-index: 9;
-  top: -2.1333333333rem;
-  left: 50%;
-  transform: translateX(-50%);
+  top: -1.8133333333rem;
+  left: 0.0266666667rem;
   width: 1.7066666667rem;
   height: 1.7066666667rem;
   border-radius: 50%;
@@ -930,30 +827,29 @@ body::-webkit-scrollbar {
   margin: 0;
   margin-top: -0.2666666667rem;
   margin-bottom: 0.0533333333rem;
-  color: #fff;
+  color: #ED7B50;
   font-size: 0.32rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank {
   overflow: auto;
   position: absolute;
   width: 100%;
-  height: 7rem;
+  height: 7.2rem;
+  background-color: white;
   padding: 0.4rem 0.2666666667rem 0;
   box-sizing: border-box;
-  margin-top: 0.25rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li {
-  width: 90%;
   display: flex;
   align-items: center;
-  margin: 0 auto 0.5333333333rem;
+  margin-bottom: 0.5333333333rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .index {
   display: inline-block;
   width: 0.4rem;
   font-size: 0.4rem;
   font-weight: bold;
-  color: #333;
+  color: #333333;
   text-align: center;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info {
@@ -976,11 +872,7 @@ body::-webkit-scrollbar {
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num {
   font-size: 0.3466666667rem;
   font-weight: bold;
-  color: #FF7700;
-}
-.wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num b {
-  color: #FF5110;
-  font-weight: bold;
+  color: #ED7B50;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine {
   position: fixed;
@@ -989,9 +881,8 @@ body::-webkit-scrollbar {
   z-index: 999;
   width: 100%;
   height: 1.3333333333rem;
-  background: url(../images/mineBg.png) no-repeat;
-  background-size: 100% 100%;
-  padding: 0 0.7rem 0 0.2rem;
+  background-color: rgba(0, 0, 0, 0.8);
+  padding: 0 0.2rem;
   box-sizing: border-box;
   display: flex;
   align-items: center;
@@ -1000,13 +891,11 @@ body::-webkit-scrollbar {
   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;
@@ -1019,20 +908,11 @@ body::-webkit-scrollbar {
   font-size: 0.3733333333rem;
   font-weight: bold;
   color: white;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  width: 3.5rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num {
   font-size: 0.3466666667rem;
   font-weight: bold;
-  color: #fff;
-  white-space: nowrap;
-}
-.wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num b {
-  color: #fff;
-  font-weight: bold;
+  color: #ED7B50;
 }
 .wrap .shade-mask-fragmentNum {
   display: none;

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

@@ -1,10 +1,9 @@
 @function px2rem($px, $rem: 75) {
     @return $px / $rem+rem;
 }
-
-// @function prefixurl() {
-//     @return 'https://img.pekolive.com/'
-// }
+@function prefixurl() {
+    @return 'https://img.pekolive.com/'
+}
 
 @font-face {
     font-family: 'pingfang-bold';
@@ -25,27 +24,11 @@
 html,
 body {
     font-family: 'din-medium';
-    background: #E17E3D;
+    background: #C8864C;
     // 海浪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;
@@ -54,15 +37,7 @@ body {
 
     .banner {
         width: 100%;
-        position: relative;
 
-        .subtitle {
-            position: absolute;
-            top: px2rem(9, );
-            right: px2rem(84, );
-            width: px2rem(140, );
-            height: px2rem(84, );
-        }
     }
 
     .rule,
@@ -85,21 +60,24 @@ body {
         // bottom: px2rem(1040);
     }
 
-    // 往轮结果
-    .previous_Round_Result {
-        width: px2rem(707, );
-        height: px2rem(114, );
+    .previous-result {
         position: absolute;
-        top: 16.1rem;
+        // bottom: px2rem(200);
+        top: px2rem(1120);
         left: 50%;
         transform: translateX(-50%);
-        background: url(../images/previous_Round_Result.png) no-repeat;
-        background-size: 100% 100%;
+        width: px2rem(710);
+        height: px2rem(68);
+        font-family: 'pingfang-bold';
+        font-size: px2rem(30);
+        font-weight: bold;
+        color: white;
+        display: flex;
+        align-items: center;
+        background: url('../images/previous-result-bg.png') no-repeat 0 0/100% 100%;
         z-index: 9;
 
         span {
-            color: #fff;
-            position: absolute;
             font-weight: bold;
             margin-left: px2rem(27);
             text-shadow: 1px 1px 0px#fc8321,
@@ -108,134 +86,41 @@ body {
                 -1px -1px 0px#fc8321,
                 1px 1px 0px#fc8321,
                 -1px -1px 0px#fc8321;
-            font-size: px2rem(36, );
-            left: px2rem(0, );
-            bottom: 1.65rem;
-            background: url(../images/wljg.png) no-repeat;
-            background-size: 100% 100%;
-            width: px2rem(128, );
-            height: px2rem(38, );
-            position: absolute;
         }
 
-        .box {
-            width: px2rem(707, );
-            height: 100%;
-            position: absolute;
-            left: 0;
-            top: 0;
-            box-sizing: border-box;
-            padding: px2rem(19, ) px2rem(10, ) 0 px2rem(10, );
-            overflow-x: scroll;
+        .result-list {
+            display: flex;
 
-            &::-webkit-scrollbar {
-                // width: 0;
-                height: 2px;
-                display: none;
+            p {
+                width: px2rem(40);
+                height: px2rem(40);
+                margin-left: px2rem(8);
+                background: url('../images/little-bubble.png') 0 0/100% 100%;
+
+                // &:nth-child(11){
+                //     width: px2rem(40, );
+                //     height: px2rem(42, );
+                //     margin-left: 0.25rem;
+                //     background: url('../images/btn_result.png') 0 0/100% 100%;
+                // }
+                img {
+                    width: 100%;
+                }
             }
 
-            ul {
-                width: 35rem;
-                height: 100%;
+        }
 
-                li {
-                    float: left;
-                    width: px2rem(122, );
-                    height: px2rem(73, );
-                    background: url(../images/previous_Round_Result_Li.png) no-repeat;
-                    background-size: 100% 100%;
-                    display: flex;
-                    justify-content: space-around;
-                    flex-wrap: wrap;
-                    box-sizing: border-box;
-                    align-items: center;
-                    margin-right: px2rem(8, );
-                    // padding: 0 px2rem(4, );
+        .more-result {
+            width: px2rem(42);
+            height: px2rem(44);
+            margin-left: 0.2rem;
 
-                    p {
-                        display: block;
-                        width: px2rem(25, );
-                        height: px2rem(25, );
-                        background: url(../images/record_bubble.png) no-repeat;
-                        background-size: 100% 100%;
-                        position: relative;
-                        margin: 0 px2rem(2, );
-
-                        img {
-                            display: block;
-                            width: 80%;
-                            position: absolute;
-                            left: 50%;
-                            top: 50%;
-                            transform: translate(-50%, -50%);
-                        }
-                    }
-                }
+            img {
+                width: 100%;
             }
         }
     }
 
-    // .previous-result {
-    //     position: absolute;
-    //     // bottom: px2rem(200);
-    //     top: px2rem(1120);
-    //     left: 50%;
-    //     transform: translateX(-50%);
-    //     width: px2rem(710);
-    //     height: px2rem(68);
-    //     font-family: 'pingfang-bold';
-    //     font-size: px2rem(30);
-    //     font-weight: bold;
-    //     color: white;
-    //     display: flex;
-    //     align-items: center;
-    //     background: url('../images/previous-result-bg.png') no-repeat 0 0/100% 100%;
-    //     z-index: 9;
-
-    //     span {
-    //         font-weight: bold;
-    //         margin-left: px2rem(27);
-    //         text-shadow: 1px 1px 0px#fc8321,
-    //             -1px -1px 0px#fc8321,
-    //             1px 1px 0px#fc8321,
-    //             -1px -1px 0px#fc8321,
-    //             1px 1px 0px#fc8321,
-    //             -1px -1px 0px#fc8321;
-    //     }
-
-    //     .result-list {
-    //         display: flex;
-
-    //         p {
-    //             width: px2rem(40);
-    //             height: px2rem(40);
-    //             margin-left: px2rem(8);
-    //             background: url('../images/little-bubble.png') 0 0/100% 100%;
-
-    //             // &:nth-child(11){
-    //             //     width: px2rem(40, );
-    //             //     height: px2rem(42, );
-    //             //     margin-left: 0.25rem;
-    //             //     background: url('../images/btn_result.png') 0 0/100% 100%;
-    //             // }
-    //             img {
-    //                 width: 100%;
-    //             }
-    //         }
-
-    //     }
-
-    //     .more-result {
-    //         width: px2rem(42);
-    //         height: px2rem(44);
-    //         margin-left: 0.2rem;
-
-    //         img {
-    //             width: 100%;
-    //         }
-    //     }
-    // }
-
     .mall {
         position: absolute;
         top: px2rem(184);
@@ -306,7 +191,6 @@ body {
                 padding-left: px2rem(47);
 
                 li {
-                    transition: all, 0.2s;
                     position: relative;
                     z-index: 99;
                     width: px2rem(138);
@@ -510,43 +394,16 @@ body {
 
         }
 
-        // 动画上
-        .wait-time-s {
-            width: px2rem(750, );
-            height: px2rem(680, );
-            position: absolute;
-            top: 1.5rem;
-            left: 50%;
-            transform: translateX(-50%);
-            z-index: 5;
-        }
-
-        // 动画下
-        .wait-time-x {
-            width: px2rem(750, );
-            height: px2rem(680, );
-            position: absolute;
-            top: 1.4rem;
-            left: 50%;
-            transform: translateX(-50%);
-        }
-
         // 开奖时间
         .draw-time {
             display: none;
             // width: px2rem(750);
             // height: px2rem(600);
-            // width: px2rem(210, );
-            width: 55%;
+            width: px2rem(210, );
             height: px2rem(213, );
-            margin: 1.8rem auto 0.2rem;
-            // background: url('../images/drawBg.png');
+            margin: 1.2rem auto 0.2rem;
+            background: url('../images/drawBg.png');
             background-size: 100% 100%;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            flex-flow: row wrap;
-            box-sizing: border-box;
 
             .count-down,
             .current-tip {
@@ -579,7 +436,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                bottom: 2.3rem;
+                bottom: 3.1rem;
                 width: 100%;
                 height: 4rem;
 
@@ -638,18 +495,13 @@ body {
 
                         .nick {
                             width: 100%;
-                            height: 1rem;
-                            line-height: 0.6rem;
                             font-size: px2rem(22, );
                             color: #fff;
                             text-align: center;
                             position: absolute;
-                            top: px2rem(85, );
+                            top: px2rem(88, );
                             left: 50%;
                             transform: translateX(-50%);
-                            overflow: hidden;
-                            white-space: nowrap;
-                            text-overflow: ellipsis; //溢出显示省略号
                         }
 
                         .num {
@@ -706,18 +558,13 @@ body {
 
                         .nick {
                             width: 100%;
-                            height: 1rem;
-                            line-height: 0.6rem;
                             font-size: px2rem(22, );
                             color: #fff;
                             text-align: center;
                             position: absolute;
-                            top: px2rem(70, );
+                            top: px2rem(76, );
                             left: 50%;
                             transform: translateX(-50%);
-                            overflow: hidden;
-                            white-space: nowrap;
-                            text-overflow: ellipsis; //溢出显示省略号
                         }
 
                         .num {
@@ -772,18 +619,13 @@ body {
 
                         .nick {
                             width: 100%;
-                            height: 1rem;
-                            line-height: 0.6rem;
                             font-size: px2rem(22, );
                             color: #fff;
                             text-align: center;
                             position: absolute;
-                            top: px2rem(70, );
+                            top: px2rem(76, );
                             left: 50%;
                             transform: translateX(-50%);
-                            overflow: hidden;
-                            white-space: nowrap;
-                            text-overflow: ellipsis; //溢出显示省略号
                         }
 
                         .num {
@@ -809,42 +651,21 @@ body {
             }
 
             .draw-pic {
+                position: absolute;
+                left: 50%;
+                transform: translateX(-50%);
+                top: 1.65rem;
                 z-index: 1;
-                width: px2rem(101, );
-                // width: 25%; 
-                height: px2rem(101, );
-                margin: 0 auto 0;
-                background: url('../images/drawBg.png') no-repeat;
-                background-size: 100% 100%;
-                position: relative;
+                width: px2rem(100);
+                // height: px2rem(91);
 
                 img {
-                    width: px2rem(60, );
+                    width: 100%;
+                    // height: 100%;
                     // margin: -0.3rem 0 0 1.18rem;
-                    position: absolute;
-                    left: 50%;
-                    top: 45%;
-                    transform: translate(-50%, -50%);
                 }
             }
 
-            // .draw-pic {
-            //     position: absolute;
-            //     left: 50%;
-            //     transform: translateX(-50%);
-            //     top: 1.65rem;
-            //     z-index: 1;
-            //     width: px2rem(100);
-            //     background: url('../images/drawBg.png');
-            //     // height: px2rem(91);
-
-            //     img {
-            //         width: 100%;
-            //         // height: 100%;
-            //         // margin: -0.3rem 0 0 1.18rem;
-            //     }
-            // }
-
             .award-info {
                 width: px2rem(600, );
                 // height: px2rem(183, );
@@ -852,7 +673,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 7.2rem;
+                top: 6.5rem;
                 display: flex;
 
                 .desc {
@@ -886,8 +707,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                // top: 3.8rem;
-                top: 4.5rem;
+                top: 3.8rem;
                 display: flex;
 
                 .put {
@@ -1104,45 +924,38 @@ body {
             width: px2rem(660);
             height: px2rem(980);
             background: white;
-            background: url(../images/myBoxBg.png) no-repeat;
-            background-size: 100% 100%;
 
             .rank-top {
                 height: px2rem(340);
-                // background-image: linear-gradient(#F49C35, #FFDD81);
+                background-image: linear-gradient(#F49C35, #FFDD81);
                 overflow: hidden;
 
                 .tab-wrap {
                     font-family: 'pingfang-regular';
-                    width: px2rem(440);
+                    width: px2rem(460);
                     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: 50%;
+                        width: px2rem(210);
                         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: #F56801;
+                        color: #F5A03A;
                         border-radius: px2rem(30);
                     }
                 }
@@ -1170,8 +983,8 @@ body {
                         }
 
                         .avatar {
-                            width: px2rem(194);
-                            height: px2rem(188);
+                            width: px2rem(132);
+                            height: px2rem(175);
                             margin-bottom: px2rem(20);
 
                             p {
@@ -1185,10 +998,8 @@ body {
                             img {
                                 position: relative;
                                 z-index: 9;
-                                top: px2rem(-160);
-                                // left: px2rem(2);
-                                left: 50%;
-                                transform: translateX(-50%);
+                                top: px2rem(-136);
+                                left: px2rem(2);
                                 width: px2rem(128);
                                 height: px2rem(128);
                                 border-radius: 50%;
@@ -1209,7 +1020,7 @@ body {
                             margin: 0;
                             margin-top: px2rem(-20);
                             margin-bottom: px2rem(4);
-                            color: #fff;
+                            color: #ED7B50;
                             font-size: px2rem(24);
                         }
                     }
@@ -1220,18 +1031,15 @@ body {
                 overflow: auto;
                 position: absolute;
                 width: 100%;
-                height: 7rem;
-                // background-color: white;
+                height: px2rem(540);
+                background-color: white;
                 padding: px2rem(30) px2rem(20) 0;
                 box-sizing: border-box;
-                margin-top: 0.25rem;
 
                 li {
-                    width: 90%;
                     display: flex;
                     align-items: center;
-                    // margin-bottom: px2rem(40);
-                    margin: 0 auto px2rem(40, );
+                    margin-bottom: px2rem(40);
 
                     &:last-child {
                         // margin-bottom: px2rem(140);
@@ -1242,7 +1050,7 @@ body {
                         width: px2rem(30);
                         font-size: px2rem(30);
                         font-weight: bold;
-                        color: #333;
+                        color: #333333;
                         text-align: center;
                     }
 
@@ -1269,12 +1077,7 @@ body {
                     .others-diamond-num {
                         font-size: px2rem(26);
                         font-weight: bold;
-                        color: #FF7700;
-
-                        b {
-                            color: #FF5110;
-                            font-weight: bold;
-                        }
+                        color: #ED7B50;
                     }
                 }
             }
@@ -1286,10 +1089,8 @@ body {
                 z-index: 999;
                 width: 100%;
                 height: px2rem(100);
-                // background-color: rgba($color: #000000, $alpha: .8);
-                background: url(../images/mineBg.png) no-repeat;
-                background-size: 100% 100%;
-                padding: 0 0.7rem 0 0.2rem;
+                background-color: rgba($color: #000000, $alpha: .8);
+                padding: 0 px2rem(15);
                 box-sizing: border-box;
                 display: flex;
                 align-items: center;
@@ -1298,14 +1099,12 @@ 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);
@@ -1319,23 +1118,13 @@ body {
                         font-size: px2rem(28);
                         font-weight: bold;
                         color: white;
-                        overflow: hidden; //超出隐藏
-                        white-space: nowrap; //不折行
-                        text-overflow: ellipsis;
-                        width: 3.5rem;
                     }
                 }
 
                 .mine-diamond-num {
                     font-size: px2rem(26);
                     font-weight: bold;
-                    color: #fff;
-                    white-space: nowrap;
-
-                    b {
-                        color: #fff;
-                        font-weight: bold;
-                    }
+                    color: #ED7B50;
                 }
             }
         }

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

@@ -46,7 +46,7 @@ body {
 }
 .record-list li {
   width: 100%;
-  height: 8.48rem;
+  height: 6.9733333333rem;
   background: url("../images/record/record-bg.png") no-repeat;
   background-size: 100% 100%;
   border-radius: 0.2666666667rem;
@@ -88,7 +88,6 @@ body {
   margin: 0.0666666667rem auto 0.3333333333rem;
   display: flex;
   justify-content: space-between;
-  position: relative;
 }
 .record-list li .result-wrap .result {
   display: flex;
@@ -99,21 +98,21 @@ body {
   color: #FFFFFF;
   padding-right: 0.1866666667rem;
   font-weight: 600;
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 1.9066666667rem;
-  height: 0.6rem;
-  background: url(../images/record/result.png) no-repeat;
+}
+.record-list li .result-wrap .result .bg {
+  width: 1.2133333333rem;
+  height: 1.2133333333rem;
+  background: url("../images/record_bubble_act.png") no-repeat;
   background-size: 100% 100%;
-  top: 0.2rem;
+  text-align: center;
+}
+.record-list li .result-wrap .result .bg img {
+  width: 75%;
+  margin-top: 0.15rem;
 }
 .record-list li .result-wrap .award {
   display: flex;
   align-items: center;
-  position: absolute;
-  right: 0rem;
-  top: -0.1rem;
 }
 .record-list li .result-wrap .award p,
 .record-list li .result-wrap .award b {
@@ -125,57 +124,25 @@ body {
   width: 0.3733333333rem;
   height: 0.3733333333rem;
 }
-.record-list li .result-wrap .result_sBox {
-  width: 8.8rem;
-  height: 1.1466666667rem;
-  margin: 1rem auto 0;
-  display: flex;
-  justify-content: center;
-  position: relative;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.record-list li .result-wrap .result_sBox .bg {
-  width: 1.1466666667rem;
-  height: 1.1466666667rem;
-  background: url("../images/record_bubble_act.png") no-repeat;
-  background-size: 100% 100%;
-  text-align: center;
-}
-.record-list li .result-wrap .result_sBox .bg img {
-  width: 75%;
-  display: block;
-  margin: 0.1333333333rem auto 0;
-}
 .record-list li .put-wrap {
   width: 84%;
   height: 1.2133333333rem;
   line-height: 1.2133333333rem;
   box-sizing: border-box;
-  margin: 2rem auto 0;
+  margin: 0 auto;
   display: flex;
-  position: relative;
 }
 .record-list li .put-wrap .put {
   font-size: 0.3733333333rem;
   color: #FFFFFF;
   font-weight: 600;
   margin-right: 0.9rem;
-  position: absolute;
-  width: 1.0266666667rem;
-  height: 0.6rem;
-  left: 50%;
-  transform: translateX(-50%);
-  background: url(../images/record/touru.png) no-repeat;
-  background-size: 100% 100%;
-  top: -0.6rem;
 }
 .record-list li .put-wrap .list {
   width: 6.72rem;
   height: 2.7733333333rem;
   display: flex;
   flex-wrap: wrap;
-  margin: 0.3rem auto 0;
 }
 .record-list li .put-wrap .list .item {
   width: 0.9866666667rem;
@@ -209,8 +176,7 @@ body {
 }
 .record-list li .put-wrap .list .item div .diamond {
   width: 0.3333333333rem;
-  height: 0.3333333333rem;
-  margin-top: -0.01rem;
+  height: 0.2666666667rem;
 }
 .record-list li .put-wrap .list .item div .in {
   font-size: 0.2666666667rem;

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

@@ -1,10 +1,9 @@
 @function px2rem($px, $rem: 75) {
     @return $px / $rem+rem;
 }
-
-// @function prefixurl() {
-//     @return 'https://img.pekolive.com/'
-// }
+@function prefixurl() {
+    @return 'https://img.pekolive.com/'
+}
 
 @font-face {
     font-family: 'pingfang-bold';
@@ -64,7 +63,7 @@ body {
 
     li {
         width: 100%;
-        height: px2rem(636, );
+        height: px2rem(523, );
         // background: linear-gradient(0deg, #46BBC1 0%, #62DEE4 100%);
         background: url('../images/record/record-bg.png') no-repeat;
         background-size: 100% 100%;
@@ -118,7 +117,6 @@ body {
             margin: px2rem(5, ) auto px2rem(25, );
             display: flex;
             justify-content: space-between;
-            position: relative;
 
             .result {
                 display: flex;
@@ -129,39 +127,26 @@ body {
                     color: #FFFFFF;
                     padding-right: px2rem(14, );
                     font-weight: 600;
-                    position: absolute;
-                    left: 50%;
-                    transform: translateX(-50%);
-                    width: px2rem(143, );
-                    height: px2rem(45, );
-                    background: url(../images/record/result.png) no-repeat;
-                    background-size: 100% 100%;
-                    top: 0.2rem;
                 }
 
-                // .bg {
-                //     width: px2rem(91, );
-                //     height: px2rem(91, );
-                //     background: url('../images/record_bubble_act.png') no-repeat;
-                //     background-size: 100% 100%;
-                //     text-align: center;
+                .bg {
+                    width: px2rem(91, );
+                    height: px2rem(91, );
+                    background: url('../images/record_bubble_act.png') no-repeat;
+                    background-size: 100% 100%;
+                    text-align: center;
 
-                //     img {
-                //         width: 75%;
-                //         margin-top: 0.15rem;
-                //     }
-                // }
+                    img {
+                        width: 75%;
+                        margin-top: 0.15rem;
+                    }
+                }
 
             }
 
             .award {
                 display: flex;
                 align-items: center;
-                position: absolute;
-                // right: 0.8rem;
-                // top: 1.8rem;
-                right: 0rem;
-                top: -0.1rem;
 
                 p,
                 b {
@@ -175,31 +160,6 @@ body {
                     height: px2rem(28, );
                 }
             }
-
-            .result_sBox {
-                width: px2rem(660, );
-                height: px2rem(86, );
-                margin: 1rem auto 0;
-                display: flex;
-                justify-content: center;
-                position: relative;
-                left: 50%;
-                transform: translateX(-50%);
-
-                .bg {
-                    width: px2rem(86, );
-                    height: px2rem(86, );
-                    background: url('../images/record_bubble_act.png') no-repeat;
-                    background-size: 100% 100%;
-                    text-align: center;
-
-                    img {
-                        width: 75%;
-                        display: block;
-                        margin: px2rem(10, ) auto 0;
-                    }
-                }
-            }
         }
 
         .put-wrap {
@@ -207,23 +167,14 @@ body {
             height: px2rem(91, );
             line-height: px2rem(91, );
             box-sizing: border-box;
-            margin: 2rem auto 0;
+            margin: 0 auto;
             display: flex;
-            position: relative;
 
             .put {
                 font-size: px2rem(28, );
                 color: #FFFFFF;
                 font-weight: 600;
                 margin-right: 0.9rem;
-                position: absolute;
-                width: px2rem(77, );
-                height: px2rem(45, );
-                left: 50%;
-                transform: translateX(-50%);
-                background: url(../images/record/touru.png) no-repeat;
-                background-size: 100% 100%;
-                top: -0.6rem;
             }
 
             .list {
@@ -231,7 +182,6 @@ body {
                 height: px2rem(208, );
                 display: flex;
                 flex-wrap: wrap;
-                margin: 0.3rem auto 0;
 
                 .item {
                     width: px2rem(74, );
@@ -269,8 +219,7 @@ body {
 
                         .diamond {
                             width: px2rem(25, );
-                            height: px2rem(25, );
-                            margin-top: -0.01rem;
+                            height: px2rem(20, );
                         }
 
                         .in {

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

@@ -6,19 +6,15 @@
     <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">
-            <img src="./images/banner.png" alt="">
-            <img class="subtitle" src="./images/subtitle.png" alt="">
-        </div>
+        <div class="banner"><img src="./images/banner.png" alt=""></div>
         <div class="rule"><img src="./images/rule.png" alt=""></div>
         <div class="record"><img src="./images/record.png" alt=""></div>
 
@@ -37,7 +33,7 @@
             <div class="recharge"><img src="./images/mall/recharge.png" alt=""></div>
         </div>
         <!-- 游戏区域 -->
-        <div class="game-area" >
+        <div class="game-area">
             <!-- 本轮轮次 -->
             <div class="roundId"></div>
             <!-- 选择时间 -->
@@ -51,86 +47,7 @@
                     <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>
@@ -142,13 +59,13 @@
                 <div class="current-tip">等待结果</div>
             </div>
             <!-- 开奖展示动画时间 -->
-            <div class="draw-time" style="display: none;">
+            <div class="draw-time">
                 <div class="count-down">下一轮：<span class="count-down-num"></span>秒</div>
                 <div class="current-tip">本轮结果：<span class="current-result"></span></div>
                 <!-- 中奖物品展示 -->
-                <!-- <div class="draw-pic">
-                    <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                </div> -->
+                <div class="draw-pic">
+                    <img src="" alt="">
+                </div>
                 <!-- 投入列表 -->
                 <div class="put-wrap">
                     <div class="put">投入</div>
@@ -182,7 +99,7 @@
                             <div class="nick">虚位以待</div>
                             <div class="num">
                                 <img src="./images/diamond.png" class="diamond" alt="">
-                                <span>0</span>
+                                <span></span>
                             </div>
                         </div>
                         <div class="no no2">
@@ -191,7 +108,7 @@
                             <div class="nick">虚位以待</div>
                             <div class="num">
                                 <img src="./images/diamond.png" class="diamond" alt="">
-                                <span>0</span>
+                                <span></span>
                             </div>
                         </div>
                         <div class="no no3">
@@ -200,28 +117,17 @@
                             <div class="nick">虚位以待</div>
                             <div class="num">
                                 <img src="./images/diamond.png" class="diamond" alt="">
-                                <span>0</span>
+                                <span></span>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            <!-- 动画上 -->
-            <div class="wait-time-s"></div>
-            <!-- 动画下 -->
-            <div class="wait-time-x"></div>
         </div>
 
         <!-- 往轮结果 -->
-        <div class="previous_Round_Result">
-            <span></span>
-            <div class="box">
-                <ul>
-                </ul>
-            </div>
-        </div>
-        <!-- <div class="previous-result">
-            <span>往輪結果</span>
+        <div class="previous-result">
+            <span>往轮结果</span>
             <div class="result-list">
                 <p><img src="" alt=""></p>
                 <p><img src="" alt=""></p>
@@ -233,10 +139,10 @@
                 <p><img src="" alt=""></p>
                 <p><img src="" alt=""></p>
                 <p><img src="" alt=""></p>
-                <p><img src="" alt=""></p>
+                <!-- <p><img src="" alt=""></p> -->
             </div>
             <span class="more-result"><img src="./images/btn_result.png" alt=""></span>
-        </div> -->
+        </div>
 
         <!-- 个人信息 -->
         <div class="info-bottom">
@@ -254,29 +160,29 @@
             <div class="shade-content">
                 <main>
                     <div class="cyfs">
-                        <p class="title">參與方式</p>
+                        <p class="title">参与方式</p>
                         用戶可通過花費鉆石參與《星級廚房》遊戲，每次最少消耗100鉆石，每回合時間30秒
                         <p class="jietu"><img src="./images/t1.png" alt=""></p>
                     </div>
                     <div class="lwff">
-                        <p class="title">禮物發放</p>
-                        每次參與遊戲後會獲得一次禮物開獎;
+                        <p class="title">礼物发放</p>
+                        每次參與遊戲後會獲得一次禮物開獎機會
                         <p class="jietu t2"><img src="./images/t2.png" alt=""></p>
-                        每次隨機從8種食材中選取一個或多個作為中獎食材，中獎後獲得（中獎物品所花費的鉆石數*中獎食材對應倍數）的鉆石獎勵，當中獎多個食材時，獲得的鉆石會同時發放。鉆石將直接發放到賬戶中。
+                        每次隨機從8種食材中選取一個作為中獎物品，中獎後獲得【中獎物品購買碎片數*中獎物品對應倍數*100】的鉆石獎勵，鉆石將直接發放到錢包
                         <p class="jietu t3"><img src="./images/t3.png" alt=""></p>
-                        例如購買1個5倍番茄花費100鉆，購買1個蘿蔔花費100鉆，中獎後將獲得100*5+100*5=1000鉆。
+                        例如購買1個5倍的番茄，中獎後獲得1*5*100的鉆石
                     </div>
                     <div class="qtsm">
                         <p class="title">其他說明</p>
-                        如果以上說明未能解答您的疑問，請聯繫客服，會有專人解答疑難
-                        <p>本活動以及活動獎勵與Google/蘋果公司無關</p>
+                        如果以上說明未能解答您的疑問，請聯系客服，會有專人解答疑難
+                        <p>本活动与苹果公司无关</p>
                     </div>
                 </main>
             </div>
         </div>
 
         <!-- 今日排名弹窗 -->
-        <div class="shade-mask-rank" >
+        <div class="shade-mask-rank">
             <div class="shade-content-rank">
                 <div class="rank-top">
 
@@ -320,12 +226,12 @@
     </div>
     <script src="../../common/js/flexible.js"></script>
     <script src="../../common/js/jquery-3.2.1.min.js"></script>
-    <script src="../../common/js/common2.js"></script>
     <script src="./js/jquery-animate-css-rotate-scale.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/svga.min.js"></script>
-    <script src="./js/index.js?v=2.1"></script>
+    <script src="./js/index.js?v=2.2"></script>
 </body>
 
 </html>

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

@@ -17,8 +17,7 @@ const showLoading = (content = '加載中...') => {
         shadeClose: false,
         content,
         success (e) {
-            layerIndex = $(e).attr('index');
-            $('.layui-m-layer').css("z-index", '9999');
+            layerIndex = $(e).attr('index')
         }
     })
 }
@@ -32,19 +31,14 @@ const toastMsg = (content = '操作完成', time = 2) => {
         skin: 'msg'
     })
 }
+
 if (false) { //!browser.app
     toastMsg('請在app內打開！');
 } else {
     $('.wrap').removeClass('no-in-app')
 }
-console.log(document.body.clientWidth);
-console.log(document.body.clientHeight);
-if (document.body.clientHeight <= 700) {
-    $('body,html').css({ "height": '19.2rem' });
-}
-if (document.body.clientWidth >= 365) {
-    $('body,html').css({ "height": '19.2rem' });
-}
+
+
 // 獲取用戶相關信息
 let myFragment
 const getUserInfo = (param) => {
@@ -82,7 +76,6 @@ 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)
@@ -133,7 +126,6 @@ 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()
@@ -143,10 +135,10 @@ const getNewestAct = () => {
                     } else {
                         clearTimeout(timer2)
                         hideLoading(layerIndex)
+
                         roundId = res.data.roundId
                         $('.game-area .roundId').html(roundId)
                         getListItem(roundId, modelType)
-                        getPreviousResults(20, roundId)
 
                         // 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload()
                         if (roundIdArr.length < 2) {
@@ -169,7 +161,7 @@ const getNewestAct = () => {
                         showResultStageStartTime = res.data.showResultStageStartTime
                         endTime = res.data.endTime
                         console.log('獲取5個時間戳的值-----', 'timestamp:', userComeinTime, 'startTime:', startTime, 'drawStageStartTime:', drawStageStartTime, 'showResultStageStartTime:', showResultStageStartTime, 'endTime:', endTime);
-                        showView(res.data.drawItemList)
+                        showView()
                     }
                 }
             } else {
@@ -203,7 +195,7 @@ let mySelect
 let fragmentNum
 let reg = /^[0-9]*$/
 
-const showView = (drawItemList) => {
+const showView = () => {
     if (startTime <= userComeinTime && userComeinTime < drawStageStartTime) {
         // 第一階段
         console.log('進入第一階段');
@@ -225,8 +217,11 @@ const showView = (drawItemList) => {
 
         $('.award-wrap').html('').show()
         // $('.award-info .desc').html('')
+
+        getPreviousResults(10, roundId)
         showCountDown(userComeinTime, startTime, drawStageStartTime)
         getUserInfo()
+
     } else if (drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime) {
         // 第二階段
         console.log('進入第二階段');
@@ -244,13 +239,16 @@ const showView = (drawItemList) => {
         console.log('isStatus2的值------------', isStatus2);
 
         // $('.btn-wrap').find('div').removeClass('active')
+
+        getPreviousResults(10, roundId)
         showCountDown(userComeinTime, drawStageStartTime, showResultStageStartTime)
         judgeStatus()
         getUserInfo()
+
         // 播放5s動畫
         let player = new SVGA.Player('.wait-time');
         let parser = new SVGA.Parser('.wait-time');
-        parser.load('./images/wait1.svga', function (videoItem) {
+        parser.load('./images/wait.svga', function (videoItem) {
             // player.loops = 2;
             player.clearsAfterStop = false;
             player.setVideoItem(videoItem);
@@ -270,33 +268,8 @@ const showView = (drawItemList) => {
         showCountDown(userComeinTime, showResultStageStartTime, endTime)
         judgeStatus()
         getUserInfo()
-        // 动画上
-        let player = new SVGA.Player('.wait-time-s');
-        let parser = new SVGA.Parser('.wait-time-s');
-        parser.load('./images/s.svga', function (videoItem) {
-            // player.loops = 2;
-            player.clearsAfterStop = false;
-            player.setVideoItem(videoItem);
-            player.startAnimation();
-        })
-        // 动画下
-        let player2 = new SVGA.Player('.wait-time-x');
-        let parser2 = new SVGA.Parser('.wait-time-x');
-        parser2.load('./images/x.svga', function (videoItem) {
-            // player.loops = 2;
-            player2.clearsAfterStop = false;
-            player2.setVideoItem(videoItem);
-            player2.startAnimation();
-        })
-        if (drawItemList.length > 1) {
-            $('.wait-time-s').show();
-            $('.wait-time-x').show();
-        } else {
-            $('.wait-time-s').hide();
-            $('.wait-time-x').hide();
-        }
+        // getPreviousResults(10, roundId)
     }
-    $('.game-area').show();
 }
 
 // 顯示倒計時
@@ -428,7 +401,7 @@ const judgeStatus = () => {
                     drawInfo = res.data
                     img = res.data.drawImageUrl
                     if (isStatus3) {
-                        getPreviousResults(20, roundId)
+                        getPreviousResults(10, roundId)
                     }
                     renderDrawInfo()
                 } else {
@@ -452,40 +425,8 @@ const judgeStatus = () => {
 let topThreeArr = []
 const renderDrawInfo = () => {
     $('.draw-time .current-tip .current-result').html(drawInfo.drawName)
-    // $('.draw-pic img').attr('src', drawInfo.drawImageUrl)
-    $('.wrap .game-area .draw-time .draw-pic').remove();
-    var lenght = drawInfo.drawItemList.length;
-    var drawStr = '';
-    drawInfo.drawItemList.forEach(item => {
-        drawStr += `
-        <div class="draw-pic">
-            <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>
-        `
-    })
-    $('.wrap .game-area .draw-time').append(drawStr);
-    if (lenght == 1) {
-        $('.wrap .game-area .draw-time').css({ "width": "55%", })
-        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "50%", "height": "100%", });
-        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "45%" });
-    } else if (lenght == 2) {
-        $('.wrap .game-area .draw-time').css({ "width": "55%", })
-        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "50%", "height": "100%", });
-        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "45%" });
-    } else if (lenght == 3) {
-        $('.wrap .game-area .draw-time').css({ "width": "70%", })
-        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "33.3333%", "height": "75%", });
-        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "40%" });
-    } else if (lenght == 4) {
-        $('.wrap .game-area .draw-time').css({ "width": "80%", })
-        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "25%", "height": "65%", });
-        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "38%" });
-    } else if (lenght > 4) {
-        $('.wrap .game-area .draw-time').css({ "width": "55%", })
-        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "1.3466666667rem", "height": "1.3466666667rem", });
-        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "0.8rem" });
-    }
-    // if()
+    $('.draw-pic img').attr('src', drawInfo.drawImageUrl)
+
     // if (isStatus3) {
     //     if (drawInfo.userDrawResult.drawStatus === 1) {
     //         $('.award-info .desc').html('恭喜你，猜中了！')
@@ -505,13 +446,13 @@ const renderDrawInfo = () => {
     $('.put-wrap .list .item').remove()
     // 渲染投入列表
     let list = ''
-    drawInfo.userDrawResult.drawRecords.map(item => {
+    drawInfo.userDrawResult.drawRecords.map(res => {
         list += `
             <div class="item">
-                <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>
+                <p><img src="${res.imgUrl}" class="gift" alt=""></p>
                 <div>
                     <img src="./images/diamond.png" class="diamond" alt="">
-                    <span class="in">${item.costPieceNum}</span>
+                    <span class="in">${res.costPieceNum}</span>
                 </div>
             </div>
         `
@@ -543,8 +484,8 @@ const renderDrawInfo = () => {
         topThreeArr.map((item, index) => {
             $(`.top-three-list .no${index + 1} .tx`).attr('uid', item.uid)
             $(`.top-three-list .no${index + 1} .tx`).attr('src', item.avatar)
-            $(`.top-three-list .no${index + 1} .nick`).text(item.nick)
-            $(`.top-three-list .no${index + 1} .num span`).text(item.prizeDiamonds ? item.prizeDiamonds : '')
+            $(`.top-three-list .no${index + 1} .nick`).html(item.nick)
+            $(`.top-three-list .no${index + 1} .num span`).html(item.prizeDiamonds)
         })
     }
 
@@ -610,10 +551,10 @@ const renderListItem = () => {
             `
         })
     } else {
-        listItem.forEach((item, i) => {
+        listItem.map((item) => {
             str += `
                 <li data-total-num={"number":"${item.costPieceNum}","id":"${item.id}"}>
-                    <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="">
+                    <img src="${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">
@@ -629,7 +570,8 @@ const renderListItem = () => {
     setTimeout2s()
 }
 
-// 獲取往輪遊戲結果 
+// 獲取往輪遊戲結果
+let previousResults = []
 const getPreviousResults = (count, roundId) => {
     networkRequest({
         type: 'GET',
@@ -640,8 +582,8 @@ const getPreviousResults = (count, roundId) => {
         },
         success (res) {
             if (res.code === 200) {
-                // previousResults = res.data
-                renderPreviousResults(res.data)
+                previousResults = res.data
+                renderPreviousResults()
             }
         },
         error (err) {
@@ -651,51 +593,40 @@ const getPreviousResults = (count, roundId) => {
 }
 
 // 渲染往輪遊戲結果
-const renderPreviousResults = (val) => {
+const renderPreviousResults = () => {
+
     let str = ''
-    if (val.length < 5) {
-        let len = 5 - val.length
+    if (previousResults.length < 5) {
+        let len = 5 - previousResults.length
         let arr = new Array(len).fill(1)
-        val.push(...arr)
+        previousResults.push(...arr)
     }
     if (isStatus3) {
         if (img) {
-            val.pop()
-            val.unshift({
+            previousResults.pop()
+            previousResults.unshift({
                 drawImageUrl: img
             })
+            console.log(previousResults);
         }
-    }
-    val.forEach(res => {
-        str += `
-            <li>
-                ${res.drawItemList.map(item => {
-            if (res.drawItemList.length == 1) {
-                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.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.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.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('')
-            }
-            </li>
+    }
+    previousResults.map((item) => {
+        str += `
+            <p><img src="${item.drawImageUrl}" alt=""></p>
         `
     })
-    $('.wrap .previous_Round_Result .box ul').html(str)
+    $('.result-list').html(str)
 }
 
 // 發送用戶抽獎數量
 const sendUserDrawInfo = (itemId, num, tais) => {
-    // showLoading();
+    showLoading();
     networkRequest({
         type: 'POST',
         url: urlPrefix + '/act/luckySea/draw',
         // contentType: 'application/json',
-        // data: `[{
+        // data: `[ {
         //     "itemId":${itemId},
         //     "num":${num}
         //   }]`,
@@ -705,19 +636,17 @@ 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, }, 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)
-                // })
+                    .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)
+                    })
                 hideLoading(layerIndex)
             } else if (31005) {
                 lock = !lock
@@ -840,7 +769,7 @@ const renderMyInfo = () => {
             num = myInfoD.num
         }
         // $('.mine-diamond-num').html('今日獎勵' + num)
-        $('.mine-diamond-num').html(num == 0 ? '—— ——' : num)
+        $('.mine-diamond-num').html(num)
     } else {
         let erbanNo = myInfoN.erbanNo
         let myIndex = rankListN.findIndex((item, index) => {
@@ -858,7 +787,7 @@ const renderMyInfo = () => {
             myInfoN.nick = '未知'
         }
         $('.mine-info').find('.mine-nick').html(myInfoN.nick)
-        $('.mine-diamond-num').html('猜中<b> ' + myInfoN.num + ' </b>次')
+        $('.mine-diamond-num').html('猜中' + myInfoN.num + '次')
     }
 }
 
@@ -974,7 +903,7 @@ const renderRankList = () => {
         othersArr.map((item, index) => {
             let num
             if (item.erbanNo) {
-                num = '猜中<b> ' + item.num + ' </b>次'
+                num = '猜中' + item.num + '次'
             }
             others += `
                 <li uid="${item.uid}">
@@ -1020,7 +949,7 @@ $(function () {
         $('.recharge').click(function () {
             // if (browser.app) {
             //     if (browser.ios) {
-            //         window.location.href = 'http://192.168.0.19:5502/view/peko/modules/pay/index.html?channelType=4';
+            //         window.location.href = 'https://api.pekolive.com/peko/modules/pay/index.html?channelType=4';
             //     } else {
             //         if (browser.android) {
             //             let channel = pubInfo.deviceInfo.channel
@@ -1042,8 +971,7 @@ $(function () {
                 }
             }
         })
-        // getPreviousResults(20, roundId)
-    }, 100)
+    }, 50)
 
     // 監聽按鈕點擊事件
     // let fragmentNum
@@ -1082,13 +1010,8 @@ $(function () {
                     window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
                 }
             } else if (browser.ios) {
-                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';
-                }
+                window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
             }
         } else {
             toastMsg('請在app內打開')
@@ -1147,7 +1070,68 @@ $(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 () {
@@ -1179,13 +1163,8 @@ $(function () {
                     window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
                 }
             } else if (browser.ios) {
-                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';
-                }
+                window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
             }
         } else {
             toastMsg('請在app內打開')
@@ -1205,27 +1184,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去到後臺或者鎖屏後再回來倒計時不準確
@@ -1247,17 +1226,4 @@ $(function () {
             $countDown.html(countDownTime)
         }
     })
-
-})
-//返回页面 重新请求接口
-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-ocean/js/record.js

@@ -23,7 +23,7 @@ $(function () {
         getUserRecord()
     }, 100)
 
-    function getUserRecord () {
+    function getUserRecord() {
         canNext = false
         networkRequest({
             type: 'GET',
@@ -32,7 +32,7 @@ $(function () {
                 page,
                 pageSize
             },
-            success (res) {
+            success(res) {
                 if (res.code === 200) {
                     if (res.data.length != 0) {
                         // 能够继续请求下一页
@@ -43,13 +43,13 @@ $(function () {
                         canNext = false
                         toastMsg('沒有更多啦~')
                     }
-
+                    
                 } else {
                     canNext = true
                     toastMsg(res.message)
                 }
             },
-            error (err) {
+            error(err) {
                 canNext = true
                 toastMsg('網絡錯誤，請退出重進')
             }
@@ -60,7 +60,7 @@ $(function () {
     const renderRecord = (recordList) => {
         if (recordList.length === 0) {
             $('.record-list').hide();
-            // $('.img').show();
+            $('.img').show();
         } else {
             // $('.record-list li').remove();
             $('.record-list').show();
@@ -69,7 +69,7 @@ $(function () {
             var drawId;
             var itemUrl;
             var results = [];
-
+            
 
             let str = '';
             recordList.forEach((res, index) => {
@@ -92,42 +92,40 @@ $(function () {
                     </div>
                     <div class="result-wrap">
                         <div class="result">
-                            <span></span>
+                            <span>本輪結果</span>
+                            <div class="bg"><img src="${itemUrl}" alt=""></div>
                         </div>
                         <div class="award">
                             <p>獎勵:</p>
                             <img src="./images/diamond.png" class="diamond" alt="">
                             <b>${res.reward}</b>
                         </div>
-                        <div class="result_sBox">
-                            ${res.drawItemList.map(item => {
-                    return `<div class="bg"><img src="${item.drawImageUrl}" alt=""></div>`
-                }).join('')}
-                        </div>
                     </div>
                     <div class="put-wrap">
-                        <div class="put"></div>
+                        <div class="put">投入</div>
                         <div class="list">
-
+    
                         </div>
                     </div>
                 </li>
-    `
+                `
+
             })
             $('.record-list').append(str)
 
 
             results.forEach((res, index) => {
                 res.forEach(val => {
+
                     $('.record-list li').eq(lisIndexId).find('.list').append(`
-                    <div class= "item">
+                    <div class="item">
                         <p><img src="${val.itemUrl}" class="gift" alt=""></p>
                         <div>
                             <img src="./images/diamond.png" class="diamond" alt="">
                             <span class="in">${val.costPiece}</span>
                         </div>
                     </div>
-    `)
+                    `)
                 })
                 lisIndex = lisIndex + 1;
                 lisIndexId = lisIndexId + 1;

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

@@ -14,122 +14,27 @@
 <body>
     <ul class="record-list">
         <!-- <li style="margin-bottom: 0.8rem;">
-            <h3>23-02-25 19:13:24</h3>
+            <h3>${dateFormat(res.drawTime, 'yy-MM-dd hh:mm:ss')}</h3>
             <div class="goldBox">
-                <span>NO.230225191242</span>
-                <p style="display: block;" class="fasle">哎呀~猜錯了 o(╥﹏╥)o</p>
-                <p style="display: none;" class="true">厲害~猜對了 ୧(๑•̀◡•́๑)૭</p>
+                <span>NO.2212092000</span>
+                <p class="fasle">哎呀~猜錯了 o(╥﹏╥)o</p>
+                <p class="true">厲害~猜對了 ୧(๑•̀◡•́๑)૭</p>
             </div>
             <div class="result-wrap">
                 <div class="result">
-                    <span></span>
+                    <span>本輪結果</span>
+                    <div class="bg"><img src="" alt=""></div>
                 </div>
                 <div class="award">
                     <p>獎勵:</p>
                     <img src="./images/diamond.png" class="diamond" alt="">
-                    <b>0</b>
-                </div>
-                <div class="result_sBox">
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
-                    <div class="bg">
-                        <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
-                    </div>
+                    <b></b>
                 </div>
             </div>
             <div class="put-wrap">
-                <div class="put"></div>
+                <div class="put">投入</div>
                 <div class="list">
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/FmLQyTfMaHlwkvj568vpV0uk7aSc?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">100</span>
-                        </div>
-                    </div>
 
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/Fm94cJfxF1Eqm0U04nG476JvFLaF?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">0</span>
-                        </div>
-                    </div>
-
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">100</span>
-                        </div>
-                    </div>
-
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/Ftlck3geTvQvvjBkyCwxuv7tHR_a?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">100</span>
-                        </div>
-                    </div>
-
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/Fnnd7i5L8BPI95DF_ZvhdGkk8cqI?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">0</span>
-                        </div>
-                    </div>
-
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/FoIKvxfBJiUUGNcL8ouKQKENQ2eb?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">100</span>
-                        </div>
-                    </div>
-
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/Fv3U6kNuCovsRljPb_an73W0U0lZ?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">100</span>
-                        </div>
-                    </div>
-
-                    <div class="item">
-                        <p><img src="http://beta.img.pekolive.com/FuEuGPGHcyGExK_nJhvx08S4KeJ9?imageslim" class="gift"
-                                alt=""></p>
-                        <div>
-                            <img src="./images/diamond.png" class="diamond" alt="">
-                            <span class="in">100</span>
-                        </div>
-                    </div>
                 </div>
             </div>
         </li> -->

view/peko/activity/annualCelebration/wish.html

@@ -76,7 +76,7 @@
         <div class="tab2_contain">
             <div class="rule_wrap">
                 <p class="rule_item">
-                    活动期间，每日登录pikoApp即可免费获赠一个魔法棒（每台设备每日限一次）
+                    活动期间，每日登录pekoApp即可免费获赠一个魔法棒（每台设备每日限一次）
                 </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>piko</title>
+  <title>peko</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">piko客服微信：pikokefu01</div>
+      <div class="weixin-name">peko客服微信：pekokefu01</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>piko</title>
+  <title>peko</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">piko客服微信：pikokefu01</div>
+      <div class="weixin-name">peko客服微信：pekokefu01</div>
       <p>粤网文:(2018)8220-2981号</p>
       <p class="recordfoot">
         <i class="record"></i>

view/peko/activity/explore/js/index.js

@@ -318,8 +318,10 @@ $(function () {
         $('body').css('overflow', 'auto')
         if (browser.app) {
             if (browser.android) {
-                tools.nativeUtils.jumpAppointPage('RECHARGE_PAGE')
+                // tools.nativeUtils.jumpAppointPage('RECHARGE_PAGE')
+                window.androidJsObj.openChargePage(8);
             } else if (browser.ios) {
+                window.webkit.messageHandlers.chargePayClickPage.postMessage(8)
                 window.webkit.messageHandlers.openChargePage.postMessage(null)
             }
         } else {

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>探索piko</title>
+  <title>探索peko</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: '我的piko一周年报告',
+        title: '我的peko一周年报告',
         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>截止目前piko已陪伴你<span class="sp1"></span>天~</p>
+                <p>截止目前peko已陪伴你<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>天都在piko里畅游</p>
+                <p>你有<span class="sp1">2222222</span>天都在peko里畅游</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>希望piko还能陪伴你度过岁岁年年~</p>
+                <p>希望peko还能陪伴你度过岁岁年年~</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">该活动最终解释权归piko平台所有</div>
+    <div class="text">该活动最终解释权归peko平台所有</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>piko棋王杯</title>
+    <title>peko棋王杯</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">该活动最终解释权归piko平台所有</div>
+    <div class="text">该活动最终解释权归peko平台所有</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">（pikokefu01）</p>进行咨询</li>
+            <li><span>4</span>有任何疑问可添加官方客服<p class="tip">（pekokefu01）</p>进行咨询</li>
         </ul>
     </div>
     <!-- 尾部图片 -->

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

@@ -32,7 +32,7 @@ let shareObj = {
     type: 2,
     data: {
         msg: 'llllll',
-        title: '上piko，开黑交友玩游戏',
+        title: '上peko，开黑交友玩游戏',
         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 == 'pikoEnterprise'){
-                    shareObj.data.link = shareObj.data.showUrl = `${urlPrefix}/peko/modules/game/register.html?inviteCode=` + res.data.inviteCode + '&shareUid=' + userInfo.uid + '&enterprise=pikoEnterprise'
+                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'
                 }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金豆好友下载piko并登录，金豆即刻到账</p>
+        <p>每成功邀请一位新人好友，即可获得200金豆好友下载peko并登录，金豆即刻到账</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">piko</span>  
+                <span class="z_user_nick">peko</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">piko新用户游戏激励金3.8元</p>
+            <p class="z_award_name">peko新用户游戏激励金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: '来piko，更有丰厚游戏激励金等你来~',
+    desc: '来peko，更有丰厚游戏激励金等你来~',
     imgUrl: 'https://api.pekolive.com/peko/modules/wxPubPay/images/logo.png'
 }
 let shareObj = {
@@ -141,13 +141,13 @@ const awardObj = [
         pic: './images/nameplate.png'
     },
     {
-        name: 'piko新用户游戏激励金3.8元',
-        desc: 'piko新用户游戏<br>激励金3.8元',
+        name: 'peko新用户游戏激励金3.8元',
+        desc: 'peko新用户游戏<br>激励金3.8元',
         pic: './images/cash.png'
     },
     {
-        name: 'piko新用户游戏激励金5.8元',
-        desc: 'piko新用户游戏<br>激励金5.8元',
+        name: 'peko新用户游戏激励金5.8元',
+        desc: 'peko新用户游戏<br>激励金5.8元',
         pic: './images/cash.png'
     },
     {

view/peko/activity/planet/index.html

@@ -10,7 +10,7 @@
 </head>
 <body>
     <div class="lead">
-        <p>piko的小可爱们~</p>
+        <p>peko的小可爱们~</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.活动最终解释权归piko所有。 
+                        3.活动最终解释权归peko所有。 
                     </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>piko公会招募令</title>
+  <title>peko公会招募令</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: 'piko公会招募令',
+  title: 'peko公会招募令',
   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: 'piko公会招募令',// 分享描述
+  desc: 'peko公会招募令',// 分享描述
 };
 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>piko</title>
+    <title>peko</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="输入注册piko的手机号" class="mobile-number" maxlength="11" id="mobile-number">
+            <input type="text" placeholder="输入注册peko的手机号" 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">快去piko参赛赢赏金吧~</p>
+        <p class="tip1">快去peko参赛赢赏金吧~</p>
         <a class="success-btn">去参赛>></a>
     </div>
 
@@ -51,7 +51,7 @@
 
     <div class="bottom">
         <img src="./images/logo.png" alt="">
-        <p>来piko打游戏，争夺更多赏金！</p>
+        <p>来peko打游戏，争夺更多赏金！</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>piko</title>
+    <title>peko</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: 'pikoapp',
+                            protocol: 'pekoapp',
                             host: 'linkedme'
                         },
                         intent: {
-                            package: 'com.mango.piko',
-                            scheme: 'pikoapp',
+                            package: 'com.mango.peko',
+                            scheme: 'pekoapp',
                         },
                         universal: {
                             host: 'api.zhongjialx.com',
@@ -118,7 +118,7 @@ const getCode = (mobile) => {
     showLoading()
     $.ajax({
         type: 'POST',
-        url: urlPrefix + '/sms/getCode?app=piko',
+        url: urlPrefix + '/sms/getCode?app=peko',
         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('该手机号未注册pikoApp<br>无法领取门票')
-                $('.shade-content .content-tip').html('请先前往pikoApp完成注册再来领取哦~')
+                $('.shade-content .title').html('该手机号未注册pekoApp<br>无法领取门票')
+                $('.shade-content .content-tip').html('请先前往pekoApp完成注册再来领取哦~')
                 $('.shade-content .content-btn').html('去APP内注册>>')
                 $('.shade-mask').show()
             } else if (res.code === 230004) {