修改sdk，修复隐私曾策

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

@@ -11,7 +11,7 @@
 html,
 body {
   font-family: "din-medium";
-  background: #C8864C;
+  background: #531800;
   overflow-x: hidden;
 }
 
@@ -22,6 +22,14 @@ body {
 }
 .wrap .banner {
   width: 100%;
+  position: relative;
+}
+.wrap .banner .subtitle {
+  position: absolute;
+  top: 0.12rem;
+  right: 1.12rem;
+  width: 1.8666666667rem;
+  height: 1.12rem;
 }
 .wrap .rule,
 .wrap .record {
@@ -39,46 +47,79 @@ body {
 .wrap .record {
   top: 2.8533333333rem;
 }
-.wrap .previous-result {
+.wrap .previous_Round_Result {
+  width: 9.4266666667rem;
+  height: 1.52rem;
   position: absolute;
-  top: 14.9333333333rem;
+  top: 16.1rem;
   left: 50%;
   transform: translateX(-50%);
-  width: 9.4666666667rem;
-  height: 0.9066666667rem;
-  font-family: "pingfang-bold";
-  font-size: 0.4rem;
-  font-weight: bold;
-  color: white;
-  display: flex;
-  align-items: center;
-  background: url("https://img.pekolive.com/cf-previous-result-bg.png") no-repeat 0 0/100% 100%;
+  background: url(../images/previous_Round_Result.png) no-repeat;
+  background-size: 100% 100%;
   z-index: 9;
 }
-.wrap .previous-result span {
+.wrap .previous_Round_Result span {
+  color: #fff;
+  position: absolute;
   font-weight: bold;
   margin-left: 0.36rem;
   text-shadow: 1px 1px 0px #fc8321, -1px -1px 0px #fc8321, 1px 1px 0px #fc8321, -1px -1px 0px #fc8321, 1px 1px 0px #fc8321, -1px -1px 0px #fc8321;
+  font-size: 0.48rem;
+  left: 0rem;
+  bottom: 1.65rem;
+  background: url(../images/wljg.png) no-repeat;
+  background-size: 100% 100%;
+  width: 1.7066666667rem;
+  height: 0.5066666667rem;
+  position: absolute;
 }
-.wrap .previous-result .result-list {
+.wrap .previous_Round_Result .box {
+  width: 9.4266666667rem;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  box-sizing: border-box;
+  padding: 0.2533333333rem 0.1333333333rem 0 0.1333333333rem;
+  overflow-x: scroll;
+}
+.wrap .previous_Round_Result .box::-webkit-scrollbar {
+  height: 2px;
+  display: none;
+}
+.wrap .previous_Round_Result .box ul {
+  width: 35rem;
+  height: 100%;
+}
+.wrap .previous_Round_Result .box ul li {
+  float: left;
+  width: 1.6266666667rem;
+  height: 0.9733333333rem;
+  background: url(../images/previous_Round_Result_Li.png) no-repeat;
+  background-size: 100% 100%;
   display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  align-items: center;
+  margin-right: 0.1066666667rem;
 }
-.wrap .previous-result .result-list p {
-  width: 0.5333333333rem;
-  height: 0.5333333333rem;
-  margin-left: 0.1066666667rem;
-  background: url("https://img.pekolive.com/cf-little-bubble.png") 0 0/100% 100%;
+.wrap .previous_Round_Result .box ul li p {
+  display: block;
+  width: 0.3333333333rem;
+  height: 0.3333333333rem;
+  background: url(../images/record_bubble.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  margin: 0 0.0266666667rem;
 }
-.wrap .previous-result .result-list p img {
-  width: 100%;
-}
-.wrap .previous-result .more-result {
-  width: 0.56rem;
-  height: 0.5866666667rem;
-  margin-left: 0.2rem;
-}
-.wrap .previous-result .more-result img {
-  width: 100%;
+.wrap .previous_Round_Result .box ul li p img {
+  display: block;
+  width: 80%;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
 }
 .wrap .mall {
   position: absolute;
@@ -97,7 +138,7 @@ body {
   z-index: 9;
   width: 100%;
   height: 14.0533333333rem;
-  background: url("https://img.pekolive.com/cf-game-area.png") no-repeat 0 0/100% 100%;
+  background: url("../images/game-area.png") no-repeat 0 0/100% 100%;
 }
 .wrap .game-area .roundId {
   font-size: 0.2666666667rem;
@@ -119,7 +160,7 @@ body {
   width: 5.45rem;
   height: 0.96rem;
   line-height: 0.8266666667rem;
-  background: url("https://img.pekolive.com/cf-count-down.png") no-repeat 0 0/100% 100%;
+  background: url("../images/count-down.png") no-repeat 0 0/100% 100%;
   text-align: center;
   font-size: 0.32rem;
   font-weight: bold;
@@ -130,7 +171,7 @@ body {
   width: 4.9066666667rem;
   height: 0.9066666667rem;
   line-height: 0.9066666667rem;
-  background: url("https://img.pekolive.com/cf-tip.png") no-repeat 0 0/100% 100%;
+  background: url("../images/tip.png") no-repeat 0 0/100% 100%;
   font-size: 0.2933333333rem;
   color: #F0C799;
 }
@@ -146,7 +187,7 @@ body {
   height: 1.9733333333rem;
   margin-top: 1.7333333333rem;
   margin-right: 0.4266666667rem;
-  background: url("https://img.pekolive.com/cf-bubble-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/bubble-bg.png") no-repeat 0 0/100% 100%;
 }
 .wrap .game-area .select-time ul li:nth-child(-n+4) {
   margin-top: 1.0666666667rem;
@@ -164,7 +205,7 @@ body {
   height: 0.3733333333rem;
   line-height: 0.3733333333rem;
   text-align: center;
-  background: url("https://img.pekolive.com/cf-multiple-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/multiple-bg.png") no-repeat 0 0/100% 100%;
   font-size: 0.2666666667rem;
   font-weight: bold;
   color: white;
@@ -179,7 +220,7 @@ body {
   box-sizing: border-box;
   width: 1.8133333333rem;
   height: 0.7733333333rem;
-  background: url("https://img.pekolive.com/cf-name-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/name-bg.png") no-repeat 0 0/100% 100%;
   text-align: center;
   font-size: 0.3333333333rem;
   font-weight: bold;
@@ -189,7 +230,7 @@ body {
 .wrap .game-area .select-time ul li .name.general {
   height: 0.6133333333rem;
   line-height: 0.4rem;
-  background: url("https://img.pekolive.com/cf-name-general-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/name-general-bg.png") no-repeat 0 0/100% 100%;
 }
 .wrap .game-area .select-time ul li .name .gift-price {
   font-size: 0.24rem;
@@ -202,7 +243,7 @@ body {
   position: absolute;
   top: -0.96rem;
   left: -0.3733333333rem;
-  background: url("https://img.pekolive.com/cf-qipao-2s.png") no-repeat 0 0/100% 100%;
+  background: url("../images/qipao-2s.png") no-repeat 0 0/100% 100%;
   transform: rotate(343deg);
   text-indent: 0.2133333333rem;
 }
@@ -234,20 +275,20 @@ body {
   width: 9.4666666667rem;
   height: 1.68rem;
   margin: 1.8666666667rem auto 0;
-  background: url("https://img.pekolive.com/cf-btn-wrap-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/btn-wrap-bg.png") no-repeat 0 0/100% 100%;
 }
 .wrap .game-area .select-time .btn-wrap div {
   display: flex;
   justify-content: center;
   width: 2.5333333333rem;
   height: 1.0666666667rem;
-  background: url("https://img.pekolive.com/cf-fragment-btn.png") no-repeat 0 0/100% 100%;
+  background: url("../images/fragment-btn.png") no-repeat 0 0/100% 100%;
   line-height: 1.0666666667rem;
   font-size: 0.4rem;
   color: #975B25;
 }
 .wrap .game-area .select-time .btn-wrap div.active {
-  background-image: url("https://img.pekolive.com/cf-fragment-btn-active.png");
+  background-image: url("../images/fragment-btn-active.png");
   color: #B33E17;
 }
 .wrap .game-area .select-time .btn-wrap div:first-child {
@@ -287,7 +328,7 @@ body {
   width: 4.2933333333rem;
   height: 0.96rem;
   line-height: 0.8266666667rem;
-  background: url("https://img.pekolive.com/cf-count-down.png") no-repeat 0 0/100% 100%;
+  background: url("../images/count-down.png") no-repeat 0 0/100% 100%;
   text-align: center;
   color: #B82F1A;
   font-size: 0.32rem;
@@ -298,19 +339,40 @@ body {
   width: 4.9066666667rem;
   height: 0.9066666667rem;
   line-height: 0.9066666667rem;
-  background: url("https://img.pekolive.com/cf-tip.png") no-repeat 0 0/100% 100%;
+  background: url("../images/tip.png") no-repeat 0 0/100% 100%;
   text-align: center;
   font-size: 0.2933333333rem;
-  color: rgba(255, 240, 199, 0.6);
+  color: #FFF0C799;
   font-weight: bold;
 }
+.wrap .game-area .wait-time-s {
+  width: 10rem;
+  height: 9.0666666667rem;
+  position: absolute;
+  top: 1.5rem;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 5;
+}
+.wrap .game-area .wait-time-x {
+  width: 10rem;
+  height: 9.0666666667rem;
+  position: absolute;
+  top: 1.4rem;
+  left: 50%;
+  transform: translateX(-50%);
+}
 .wrap .game-area .draw-time {
   display: none;
-  width: 2.8rem;
+  width: 55%;
   height: 2.84rem;
-  margin: 1.2rem auto 0.2rem;
-  background: url("https://img.pekolive.com/cf-drawBg.png");
+  margin: 1.8rem auto 0.2rem;
   background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-flow: row wrap;
+  box-sizing: border-box;
 }
 .wrap .game-area .draw-time .count-down,
 .wrap .game-area .draw-time .current-tip {
@@ -322,7 +384,7 @@ body {
   width: 4.2933333333rem;
   height: 0.96rem;
   line-height: 0.8266666667rem;
-  background: url("https://img.pekolive.com/cf-count-down.png") no-repeat 0 0/100% 100%;
+  background: url("../images/count-down.png") no-repeat 0 0/100% 100%;
   text-align: center;
   font-size: 0.32rem;
   color: #B82F1A;
@@ -333,7 +395,7 @@ body {
   width: 4.9066666667rem;
   height: 0.9066666667rem;
   line-height: 0.9066666667rem;
-  background: url("https://img.pekolive.com/cf-tip.png") no-repeat 0 0/100% 100%;
+  background: url("../images/tip.png") no-repeat 0 0/100% 100%;
   font-size: 0.2933333333rem;
   color: #F0C799;
 }
@@ -341,7 +403,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 3.1rem;
+  bottom: 2.3rem;
   width: 100%;
   height: 4rem;
 }
@@ -391,13 +453,18 @@ body {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no1 .nick {
   width: 100%;
+  height: 1rem;
+  line-height: 0.6rem;
   font-size: 0.2933333333rem;
   color: #fff;
   text-align: center;
   position: absolute;
-  top: 1.1733333333rem;
+  top: 1.1333333333rem;
   left: 50%;
   transform: translateX(-50%);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no1 .num {
   width: 100%;
@@ -443,13 +510,18 @@ body {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no2 .nick {
   width: 100%;
+  height: 1rem;
+  line-height: 0.6rem;
   font-size: 0.2933333333rem;
   color: #fff;
   text-align: center;
   position: absolute;
-  top: 1.0133333333rem;
+  top: 0.9333333333rem;
   left: 50%;
   transform: translateX(-50%);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no2 .num {
   width: 100%;
@@ -496,13 +568,18 @@ body {
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no3 .nick {
   width: 100%;
+  height: 1rem;
+  line-height: 0.6rem;
   font-size: 0.2933333333rem;
   color: #fff;
   text-align: center;
   position: absolute;
-  top: 1.0133333333rem;
+  top: 0.9333333333rem;
   left: 50%;
   transform: translateX(-50%);
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .wrap .game-area .draw-time .top-three .top-three-list .no3 .num {
   width: 100%;
@@ -521,15 +598,20 @@ body {
   color: #fff;
 }
 .wrap .game-area .draw-time .draw-pic {
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: 1.65rem;
   z-index: 1;
-  width: 1.3333333333rem;
+  width: 1.3466666667rem;
+  height: 1.3466666667rem;
+  margin: 0 auto 0;
+  background: url("../images/drawBg.png") no-repeat;
+  background-size: 100% 100%;
+  position: relative;
 }
 .wrap .game-area .draw-time .draw-pic img {
-  width: 100%;
+  width: 0.8rem;
+  position: absolute;
+  left: 50%;
+  top: 45%;
+  transform: translate(-50%, -50%);
 }
 .wrap .game-area .draw-time .award-info {
   width: 8rem;
@@ -537,7 +619,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 6.5rem;
+  top: 7.2rem;
   display: flex;
 }
 .wrap .game-area .draw-time .award-info .desc {
@@ -563,7 +645,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 3.8rem;
+  top: 4.5rem;
   display: flex;
 }
 .wrap .game-area .draw-time .put-wrap .put {
@@ -594,7 +676,7 @@ body {
 .wrap .game-area .draw-time .put-wrap .list .item p {
   width: 0.8266666667rem;
   height: 0.8266666667rem;
-  background: url("https://img.pekolive.com/cf-record_bubble.png") no-repeat;
+  background: url("../images/record_bubble.png") no-repeat;
   background-size: 100% 100%;
 }
 .wrap .game-area .draw-time .put-wrap .list .item p .gift {
@@ -626,7 +708,7 @@ body {
   z-index: 99;
   width: 100%;
   height: 1.7333333333rem;
-  background: url("https://img.pekolive.com/cf-index-bottom.png") no-repeat 0 0/100% 100%;
+  background: url("../images/index-bottom.png") no-repeat 0 0/100% 100%;
   display: flex;
   align-items: center;
 }
@@ -686,7 +768,7 @@ body {
   transform: translate(-50%, -50%);
   width: 7.68rem;
   height: 8.88rem;
-  background: url("https://img.pekolive.com/cf-rule-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/rule-bg.png") no-repeat 0 0/100% 100%;
   font-size: 0.3466666667rem;
   color: #B58147;
   font-weight: 600;
@@ -709,7 +791,7 @@ body {
   width: 3.36rem;
   height: 0.6133333333rem;
   line-height: 0.6133333333rem;
-  background: url("https://img.pekolive.com/cf-title-bg.png") no-repeat 0 0/100% 100%;
+  background: url("../images/title-bg.png") no-repeat 0 0/100% 100%;
   margin: 0 auto 0.2933333333rem;
   text-align: center;
 }
@@ -743,10 +825,11 @@ body {
   width: 8.8rem;
   height: 13.0666666667rem;
   background: white;
+  background: url(../images/myBoxBg.png) no-repeat;
+  background-size: 100% 100%;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top {
   height: 4.5333333333rem;
-  background-image: linear-gradient(#F49C35, #FFDD81);
   overflow: hidden;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .tab-wrap {
@@ -794,8 +877,8 @@ body {
   display: none;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar {
-  width: 1.76rem;
-  height: 2.3333333333rem;
+  width: 2.5866666667rem;
+  height: 2.5066666667rem;
   margin-bottom: 0.2666666667rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar p {
@@ -803,13 +886,14 @@ body {
   z-index: 99;
   width: 100%;
   height: 100%;
-  background: url("https://img.pekolive.com/cf-first.png") no-repeat 0 0/100% 100%;
+  background: url("../images/first.png") no-repeat 0 0/100% 100%;
 }
 .wrap .shade-mask-rank .shade-content-rank .rank-top .topthree-wrap .info-wrap .avatar img {
   position: relative;
   z-index: 9;
-  top: -1.8133333333rem;
-  left: 0.0266666667rem;
+  top: -2.1333333333rem;
+  left: 50%;
+  transform: translateX(-50%);
   width: 1.7066666667rem;
   height: 1.7066666667rem;
   border-radius: 50%;
@@ -827,29 +911,30 @@ body {
   margin: 0;
   margin-top: -0.2666666667rem;
   margin-bottom: 0.0533333333rem;
-  color: #ED7B50;
+  color: #FF5110;
   font-size: 0.32rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank {
   overflow: auto;
   position: absolute;
   width: 100%;
-  height: 7.2rem;
-  background-color: white;
+  height: 6.9rem;
   padding: 0.4rem 0.2666666667rem 0;
   box-sizing: border-box;
+  margin-top: 0.25rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li {
+  width: 90%;
   display: flex;
   align-items: center;
-  margin-bottom: 0.5333333333rem;
+  margin: 0 auto 0.5333333333rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .index {
   display: inline-block;
   width: 0.4rem;
   font-size: 0.4rem;
   font-weight: bold;
-  color: #333333;
+  color: #fff;
   text-align: center;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info {
@@ -867,12 +952,16 @@ body {
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-info .others-nick {
   font-size: 0.3733333333rem;
   font-weight: bold;
-  color: #333333;
+  color: #fff;
 }
 .wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num {
   font-size: 0.3466666667rem;
   font-weight: bold;
-  color: #ED7B50;
+  color: #fff;
+}
+.wrap .shade-mask-rank .shade-content-rank .other-rank li .others-diamond-num b {
+  color: #FF5110;
+  font-weight: bold;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine {
   position: fixed;
@@ -881,8 +970,9 @@ body {
   z-index: 999;
   width: 100%;
   height: 1.3333333333rem;
-  background-color: rgba(0, 0, 0, 0.8);
-  padding: 0 0.2rem;
+  background: url(../images/mineBg.png) no-repeat;
+  background-size: 100% 100%;
+  padding: 0 0.7rem 0 0.2rem;
   box-sizing: border-box;
   display: flex;
   align-items: center;
@@ -908,11 +998,19 @@ body {
   font-size: 0.3733333333rem;
   font-weight: bold;
   color: white;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: 3.5rem;
 }
 .wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num {
   font-size: 0.3466666667rem;
   font-weight: bold;
-  color: #ED7B50;
+  color: #fff;
+}
+.wrap .shade-mask-rank .shade-content-rank .mine .mine-diamond-num b {
+  color: #FF5110;
+  font-weight: bold;
 }
 .wrap .shade-mask-fragmentNum {
   display: none;
@@ -997,7 +1095,7 @@ body {
   z-index: 99;
   width: 100%;
   height: 1.7333333333rem;
-  background: url("https://img.pekolive.com/cf-bottom.png") no-repeat 0 0/100% 100%;
+  background: url("../images/bottom.png") no-repeat 0 0/100% 100%;
   display: flex;
   align-items: center;
 }

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

@@ -1,9 +1,10 @@
 @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';
@@ -24,9 +25,10 @@
 html,
 body {
     font-family: 'din-medium';
-    background: #C8864C;
+    background: #531800;
     // 海浪svga过长
     overflow-x: hidden;
+    // height: 19rem;
 }
 
 .wrap {
@@ -37,7 +39,15 @@ body {
 
     .banner {
         width: 100%;
+        position: relative;
 
+        .subtitle {
+            position: absolute;
+            top: px2rem(9, );
+            right: px2rem(84, );
+            width: px2rem(140, );
+            height: px2rem(84, );
+        }
     }
 
     .rule,
@@ -60,24 +70,21 @@ body {
         // bottom: px2rem(1040);
     }
 
-    .previous-result {
+    // 往轮结果
+    .previous_Round_Result {
+        width: px2rem(707, );
+        height: px2rem(114, );
         position: absolute;
-        // bottom: px2rem(200);
-        top: px2rem(1120);
+        top: 16.1rem;
         left: 50%;
         transform: translateX(-50%);
-        width: px2rem(710);
-        height: px2rem(68);
-        font-family: 'pingfang-bold';
-        font-size: px2rem(30);
-        font-weight: bold;
-        color: white;
-        display: flex;
-        align-items: center;
-        background: url(prefixurl()+'cf-previous-result-bg.png') no-repeat 0 0/100% 100%;
+        background: url(../images/previous_Round_Result.png) no-repeat;
+        background-size: 100% 100%;
         z-index: 9;
 
         span {
+            color: #fff;
+            position: absolute;
             font-weight: bold;
             margin-left: px2rem(27);
             text-shadow: 1px 1px 0px#fc8321,
@@ -86,40 +93,133 @@ body {
                 -1px -1px 0px#fc8321,
                 1px 1px 0px#fc8321,
                 -1px -1px 0px#fc8321;
+            font-size: px2rem(36, );
+            left: px2rem(0, );
+            bottom: 1.65rem;
+            background: url(../images/wljg.png) no-repeat;
+            background-size: 100% 100%;
+            width: px2rem(128, );
+            height: px2rem(38, );
+            position: absolute;
         }
 
-        .result-list {
+        .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;
+
+            &::-webkit-scrollbar {
+                // width: 0;
+                height: 2px;
+                display: none;
+            }
+
+            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, );
 
                     p {
-                width: px2rem(40);
-                height: px2rem(40);
-                margin-left: px2rem(8);
-                background: url(prefixurl()+'cf-little-bubble.png') 0 0/100% 100%;
+                        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, );
 
-                // &:nth-child(11){
-                //     width: px2rem(40, );
-                //     height: px2rem(42, );
-                //     margin-left: 0.25rem;
-                //     background: url('../images/btn_result.png') 0 0/100% 100%;
+                        img {
+                            display: block;
+                            width: 80%;
+                            position: absolute;
+                            left: 50%;
+                            top: 50%;
+                            transform: translate(-50%, -50%);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // .previous-result {
+    //     position: absolute;
+    //     // bottom: px2rem(200);
+    //     top: px2rem(1120);
+    //     left: 50%;
+    //     transform: translateX(-50%);
+    //     width: px2rem(710);
+    //     height: px2rem(68);
+    //     font-family: 'pingfang-bold';
+    //     font-size: px2rem(30);
+    //     font-weight: bold;
+    //     color: white;
+    //     display: flex;
+    //     align-items: center;
+    //     background: url('../images/previous-result-bg.png') no-repeat 0 0/100% 100%;
+    //     z-index: 9;
+
+    //     span {
+    //         font-weight: bold;
+    //         margin-left: px2rem(27);
+    //         text-shadow: 1px 1px 0px#fc8321,
+    //             -1px -1px 0px#fc8321,
+    //             1px 1px 0px#fc8321,
+    //             -1px -1px 0px#fc8321,
+    //             1px 1px 0px#fc8321,
+    //             -1px -1px 0px#fc8321;
     //     }
-                img {
-                    width: 100%;
-                }
-            }
 
-        }
+    //     .result-list {
+    //         display: flex;
 
-        .more-result {
-            width: px2rem(42);
-            height: px2rem(44);
-            margin-left: 0.2rem;
+    //         p {
+    //             width: px2rem(40);
+    //             height: px2rem(40);
+    //             margin-left: px2rem(8);
+    //             background: url('../images/little-bubble.png') 0 0/100% 100%;
 
-            img {
-                width: 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;
@@ -141,7 +241,7 @@ body {
         z-index: 9;
         width: 100%;
         height: px2rem(1054);
-        background: url(prefixurl()+'cf-game-area.png') no-repeat 0 0/100% 100%;
+        background: url('../images/game-area.png') no-repeat 0 0/100% 100%;
 
         .roundId {
             font-size: px2rem(20, );
@@ -166,7 +266,7 @@ body {
                 width: 5.45rem;
                 height: px2rem(72);
                 line-height: px2rem(62);
-                background: url(prefixurl()+'cf-count-down.png') no-repeat 0 0/100% 100%;
+                background: url('../images/count-down.png') no-repeat 0 0/100% 100%;
                 text-align: center;
                 font-size: px2rem(24);
                 font-weight: bold;
@@ -178,7 +278,7 @@ body {
                 width: px2rem(368);
                 height: px2rem(68);
                 line-height: px2rem(68);
-                background: url(prefixurl()+'cf-tip.png') no-repeat 0 0/100% 100%;
+                background: url('../images/tip.png') no-repeat 0 0/100% 100%;
                 font-size: px2rem(22);
                 color: #F0C799;
             }
@@ -197,7 +297,7 @@ body {
                     height: px2rem(148);
                     margin-top: px2rem(130);
                     margin-right: px2rem(32);
-                    background: url(prefixurl()+'cf-bubble-bg.png') no-repeat 0 0/100% 100%;
+                    background: url('../images/bubble-bg.png') no-repeat 0 0/100% 100%;
 
                     &:nth-child(-n+4) {
                         margin-top: px2rem(80);
@@ -217,7 +317,7 @@ body {
                         height: px2rem(28);
                         line-height: px2rem(28);
                         text-align: center;
-                        background: url(prefixurl()+'cf-multiple-bg.png') no-repeat 0 0/100% 100%;
+                        background: url('../images/multiple-bg.png') no-repeat 0 0/100% 100%;
                         font-size: px2rem(20);
                         font-weight: bold;
                         color: white;
@@ -233,7 +333,7 @@ body {
                         box-sizing: border-box;
                         width: px2rem(136);
                         height: px2rem(58);
-                        background: url(prefixurl()+'cf-name-bg.png') no-repeat 0 0/100% 100%;
+                        background: url('../images/name-bg.png') no-repeat 0 0/100% 100%;
                         text-align: center;
                         font-size: px2rem(25);
                         font-weight: bold;
@@ -243,7 +343,7 @@ body {
                         &.general {
                             height: px2rem(46);
                             line-height: px2rem(30);
-                            background: url(prefixurl()+'cf-name-general-bg.png') no-repeat 0 0/100% 100%;
+                            background: url('../images/name-general-bg.png') no-repeat 0 0/100% 100%;
                         }
 
                         .gift-price {
@@ -261,7 +361,7 @@ body {
                         position: absolute;
                         top: px2rem(-72);
                         left: px2rem(-28);
-                        background: url(prefixurl()+'cf-qipao-2s.png') no-repeat 0 0/100% 100%;
+                        background: url('../images/qipao-2s.png') no-repeat 0 0/100% 100%;
                         transform: rotate(343deg);
                         text-indent: px2rem(16);
 
@@ -309,20 +409,20 @@ body {
                 width: px2rem(710);
                 height: px2rem(126);
                 margin: px2rem(140) auto 0;
-                background: url(prefixurl()+'cf-btn-wrap-bg.png') no-repeat 0 0/100% 100%;
+                background: url('../images/btn-wrap-bg.png') no-repeat 0 0/100% 100%;
 
                 div {
                     display: flex;
                     justify-content: center;
                     width: px2rem(190);
                     height: px2rem(80);
-                    background: url(prefixurl()+'cf-fragment-btn.png') no-repeat 0 0/100% 100%;
+                    background: url('../images/fragment-btn.png') no-repeat 0 0/100% 100%;
                     line-height: px2rem(80);
                     font-size: px2rem(30);
                     color: #975B25;
 
                     &.active {
-                        background-image: url(prefixurl()+'cf-fragment-btn-active.png');
+                        background-image: url('../images/fragment-btn-active.png');
                         color: #B33E17;
                     }
 
@@ -373,7 +473,7 @@ body {
                 width: px2rem(322);
                 height: px2rem(72);
                 line-height: px2rem(62);
-                background: url(prefixurl()+'cf-count-down.png') no-repeat 0 0/100% 100%;
+                background: url('../images/count-down.png') no-repeat 0 0/100% 100%;
                 text-align: center;
                 color: #B82F1A;
                 font-size: px2rem(24);
@@ -385,7 +485,7 @@ body {
                 width: px2rem(368);
                 height: px2rem(68);
                 line-height: px2rem(68);
-                background: url(prefixurl()+'cf-tip.png') no-repeat 0 0/100% 100%;
+                background: url('../images/tip.png') no-repeat 0 0/100% 100%;
                 text-align: center;
                 font-size: px2rem(22);
                 color: #FFF0C799;
@@ -394,16 +494,43 @@ body {
 
         }
 
+        // 动画上
+        .wait-time-s {
+            width: px2rem(750, );
+            height: px2rem(680, );
+            position: absolute;
+            top: 1.5rem;
+            left: 50%;
+            transform: translateX(-50%);
+            z-index: 5;
+        }
+
+        // 动画下
+        .wait-time-x {
+            width: px2rem(750, );
+            height: px2rem(680, );
+            position: absolute;
+            top: 1.4rem;
+            left: 50%;
+            transform: translateX(-50%);
+        }
+
         // 开奖时间
         .draw-time {
             display: none;
             // width: px2rem(750);
             // height: px2rem(600);
-            width: px2rem(210, );
+            // width: px2rem(210, );
+            width: 55%;
             height: px2rem(213, );
-            margin: 1.2rem auto 0.2rem;
-            background: url(prefixurl()+'cf-drawBg.png');
+            margin: 1.8rem auto 0.2rem;
+            // background: url('../images/drawBg.png');
             background-size: 100% 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-flow: row wrap;
+            box-sizing: border-box;
 
             .count-down,
             .current-tip {
@@ -415,7 +542,7 @@ body {
                 width: px2rem(322);
                 height: px2rem(72);
                 line-height: px2rem(62);
-                background: url(prefixurl()+'cf-count-down.png') no-repeat 0 0/100% 100%;
+                background: url('../images/count-down.png') no-repeat 0 0/100% 100%;
                 text-align: center;
                 font-size: px2rem(24);
                 color: #B82F1A;
@@ -427,7 +554,7 @@ body {
                 width: px2rem(368);
                 height: px2rem(68);
                 line-height: px2rem(68);
-                background: url(prefixurl()+'cf-tip.png') no-repeat 0 0/100% 100%;
+                background: url('../images/tip.png') no-repeat 0 0/100% 100%;
                 font-size: px2rem(22);
                 color: #F0C799;
             }
@@ -436,7 +563,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                bottom: 3.1rem;
+                bottom: 2.3rem;
                 width: 100%;
                 height: 4rem;
 
@@ -495,13 +622,18 @@ body {
 
                         .nick {
                             width: 100%;
+                            height: 1rem;
+                            line-height: 0.6rem;
                             font-size: px2rem(22, );
                             color: #fff;
                             text-align: center;
                             position: absolute;
-                            top: px2rem(88, );
+                            top: px2rem(85, );
                             left: 50%;
                             transform: translateX(-50%);
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis; //溢出显示省略号
                         }
 
                         .num {
@@ -558,13 +690,18 @@ body {
 
                         .nick {
                             width: 100%;
+                            height: 1rem;
+                            line-height: 0.6rem;
                             font-size: px2rem(22, );
                             color: #fff;
                             text-align: center;
                             position: absolute;
-                            top: px2rem(76, );
+                            top: px2rem(70, );
                             left: 50%;
                             transform: translateX(-50%);
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis; //溢出显示省略号
                         }
 
                         .num {
@@ -619,13 +756,18 @@ body {
 
                         .nick {
                             width: 100%;
+                            height: 1rem;
+                            line-height: 0.6rem;
                             font-size: px2rem(22, );
                             color: #fff;
                             text-align: center;
                             position: absolute;
-                            top: px2rem(76, );
+                            top: px2rem(70, );
                             left: 50%;
                             transform: translateX(-50%);
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis; //溢出显示省略号
                         }
 
                         .num {
@@ -651,21 +793,42 @@ body {
             }
 
             .draw-pic {
-                position: absolute;
-                left: 50%;
-                transform: translateX(-50%);
-                top: 1.65rem;
                 z-index: 1;
-                width: px2rem(100);
-                // height: px2rem(91);
+                width: px2rem(101, );
+                // width: 25%; 
+                height: px2rem(101, );
+                margin: 0 auto 0;
+                background: url('../images/drawBg.png') no-repeat;
+                background-size: 100% 100%;
+                position: relative;
 
                 img {
-                    width: 100%;
-                    // height: 100%;
+                    width: px2rem(60, );
                     // margin: -0.3rem 0 0 1.18rem;
+                    position: absolute;
+                    left: 50%;
+                    top: 45%;
+                    transform: translate(-50%, -50%);
                 }
             }
 
+            // .draw-pic {
+            //     position: absolute;
+            //     left: 50%;
+            //     transform: translateX(-50%);
+            //     top: 1.65rem;
+            //     z-index: 1;
+            //     width: px2rem(100);
+            //     background: url('../images/drawBg.png');
+            //     // height: px2rem(91);
+
+            //     img {
+            //         width: 100%;
+            //         // height: 100%;
+            //         // margin: -0.3rem 0 0 1.18rem;
+            //     }
+            // }
+
             .award-info {
                 width: px2rem(600, );
                 // height: px2rem(183, );
@@ -673,7 +836,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 6.5rem;
+                top: 7.2rem;
                 display: flex;
 
                 .desc {
@@ -707,7 +870,8 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 3.8rem;
+                // top: 3.8rem;
+                top: 4.5rem;
                 display: flex;
 
                 .put {
@@ -741,7 +905,7 @@ body {
                         p {
                             width: px2rem(62, );
                             height: px2rem(62, );
-                            background: url(prefixurl()+'cf-record_bubble.png') no-repeat;
+                            background: url('../images/record_bubble.png') no-repeat;
                             background-size: 100% 100%;
 
                             .gift {
@@ -785,7 +949,7 @@ body {
         z-index: 99;
         width: 100%;
         height: px2rem(130);
-        background: url(prefixurl()+'cf-index-bottom.png') no-repeat 0 0/100% 100%;
+        background: url('../images/index-bottom.png') no-repeat 0 0/100% 100%;
         display: flex;
         // justify-content: space-evenly;
         align-items: center;
@@ -855,7 +1019,7 @@ body {
             transform: translate(-50%, -50%);
             width: px2rem(576);
             height: px2rem(666);
-            background: url(prefixurl()+'cf-rule-bg.png') no-repeat 0 0/100% 100%;
+            background: url('../images/rule-bg.png') no-repeat 0 0/100% 100%;
             // padding: px2rem(56) px2rem(54) px2rem(42) px2rem(40);
             // box-sizing: border-box;
             font-size: px2rem(26);
@@ -880,7 +1044,7 @@ body {
                         width: px2rem(252);
                         height: px2rem(46);
                         line-height: px2rem(46);
-                        background: url(prefixurl()+'cf-title-bg.png') no-repeat 0 0/100% 100%;
+                        background: url('../images/title-bg.png') no-repeat 0 0/100% 100%;
                         margin: 0 auto px2rem(22);
                         text-align: center;
                     }
@@ -924,10 +1088,12 @@ body {
             width: px2rem(660);
             height: px2rem(980);
             background: white;
+            background: url(../images/myBoxBg.png) no-repeat;
+            background-size: 100% 100%;
 
             .rank-top {
                 height: px2rem(340);
-                background-image: linear-gradient(#F49C35, #FFDD81);
+                // background-image: linear-gradient(#F49C35, #FFDD81);
                 overflow: hidden;
 
                 .tab-wrap {
@@ -983,8 +1149,8 @@ body {
                         }
 
                         .avatar {
-                            width: px2rem(132);
-                            height: px2rem(175);
+                            width: px2rem(194);
+                            height: px2rem(188);
                             margin-bottom: px2rem(20);
 
                             p {
@@ -992,14 +1158,16 @@ body {
                                 z-index: 99;
                                 width: 100%;
                                 height: 100%;
-                                background: url(prefixurl()+'cf-first.png') no-repeat 0 0/100% 100%;
+                                background: url('../images/first.png') no-repeat 0 0/100% 100%;
                             }
 
                             img {
                                 position: relative;
                                 z-index: 9;
-                                top: px2rem(-136);
-                                left: px2rem(2);
+                                top: px2rem(-160);
+                                // left: px2rem(2);
+                                left: 50%;
+                                transform: translateX(-50%);
                                 width: px2rem(128);
                                 height: px2rem(128);
                                 border-radius: 50%;
@@ -1020,7 +1188,7 @@ body {
                             margin: 0;
                             margin-top: px2rem(-20);
                             margin-bottom: px2rem(4);
-                            color: #ED7B50;
+                            color: #FF5110;
                             font-size: px2rem(24);
                         }
                     }
@@ -1031,15 +1199,18 @@ body {
                 overflow: auto;
                 position: absolute;
                 width: 100%;
-                height: px2rem(540);
-                background-color: white;
+                height: 6.9rem;
+                // background-color: white;
                 padding: px2rem(30) px2rem(20) 0;
                 box-sizing: border-box;
+                margin-top: 0.25rem;
 
                 li {
+                    width: 90%;
                     display: flex;
                     align-items: center;
-                    margin-bottom: px2rem(40);
+                    // margin-bottom: px2rem(40);
+                    margin: 0 auto px2rem(40, );
 
                     &:last-child {
                         // margin-bottom: px2rem(140);
@@ -1050,7 +1221,7 @@ body {
                         width: px2rem(30);
                         font-size: px2rem(30);
                         font-weight: bold;
-                        color: #333333;
+                        color: #fff;
                         text-align: center;
                     }
 
@@ -1070,14 +1241,19 @@ body {
                         .others-nick {
                             font-size: px2rem(28);
                             font-weight: bold;
-                            color: #333333;
+                            color: #fff;
                         }
                     }
 
                     .others-diamond-num {
                         font-size: px2rem(26);
                         font-weight: bold;
-                        color: #ED7B50;
+                        color: #fff;
+
+                        b {
+                            color: #FF5110;
+                            font-weight: bold;
+                        }
                     }
                 }
             }
@@ -1089,8 +1265,10 @@ body {
                 z-index: 999;
                 width: 100%;
                 height: px2rem(100);
-                background-color: rgba($color: #000000, $alpha: .8);
-                padding: 0 px2rem(15);
+                // background-color: rgba($color: #000000, $alpha: .8);
+                background: url(../images/mineBg.png) no-repeat;
+                background-size: 100% 100%;
+                padding: 0 0.7rem 0 0.2rem;
                 box-sizing: border-box;
                 display: flex;
                 align-items: center;
@@ -1118,13 +1296,22 @@ body {
                         font-size: px2rem(28);
                         font-weight: bold;
                         color: white;
+                        overflow: hidden; //超出隐藏
+                        white-space: nowrap; //不折行
+                        text-overflow: ellipsis;
+                        width: 3.5rem;
                     }
                 }
 
                 .mine-diamond-num {
                     font-size: px2rem(26);
                     font-weight: bold;
-                    color: #ED7B50;
+                    color: #fff;
+
+                    b {
+                        color: #FF5110;
+                        font-weight: bold;
+                    }
                 }
             }
         }
@@ -1223,7 +1410,7 @@ body {
     z-index: 99;
     width: 100%;
     height: px2rem(130);
-    background: url(prefixurl()+'cf-bottom.png') no-repeat 0 0/100% 100%;
+    background: url('../images/bottom.png') no-repeat 0 0/100% 100%;
     display: flex;
     align-items: center;
 

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

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

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

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

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

@@ -17,7 +17,7 @@ body {
 .header {
   width: 10rem;
   height: 4.2266666667rem;
-  background: url("https://img.pekolive.com/cf-result_main.png");
+  background: url("../images/result_main.png");
   background-size: 100% 100%;
   margin: 0 auto;
   position: relative;
@@ -45,7 +45,7 @@ body {
 .main {
   width: 10rem;
   height: 15.6rem;
-  background: url("https://img.pekolive.com/cf-game-area.png");
+  background: url("../images/game-area.png");
   background-size: 100% 100%;
   margin: -1.85rem auto 0;
   position: relative;
@@ -55,7 +55,7 @@ body {
   width: 9.4533333333rem;
   height: 1.1466666667rem;
   line-height: 1.1466666667rem;
-  background: url("https://img.pekolive.com/cf-result_list_bg.png");
+  background: url("../images/result_list_bg.png");
   background-size: 100% 100%;
   box-sizing: border-box;
   margin: 0 auto 0.24rem;
@@ -86,7 +86,7 @@ body {
   height: 0.8266666667rem;
   line-height: 1.1466666667rem;
   margin-left: 0.4666666667rem;
-  background: url("https://img.pekolive.com/cf-record_bubble.png");
+  background: url("../images/record_bubble.png");
   background-size: 100% 100%;
 }
 .main li .list p img {

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

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

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

@@ -8,15 +8,18 @@
     <title>星级厨房</title>
 
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/index.css?v=2.1">
+    <link rel="stylesheet" href="./css/index.css?v=2.2">
 </head>
 
 <body>
     <div class="wrap no-in-app">
         <!-- <div class="wrap "> -->
-        <div class="banner"><img src="https://img.pekolive.com/cf-banner.png" alt=""></div>
-        <div class="rule"><img src="https://img.pekolive.com/cf-rule.png" alt=""></div>
-        <div class="record"><img src="https://img.pekolive.com/cf-record.png" alt=""></div>
+        <div class="banner">
+            <img src="./images/banner.png" alt="">
+            <img class="subtitle" src="./images/subtitle.png" alt="">
+        </div>
+        <div class="rule"><img src="./images/rule.png" alt=""></div>
+        <div class="record"><img src="./images/record.png" alt=""></div>
 
         <!-- 特权商城 -->
         <div class="mall" style="display: none;">
@@ -33,7 +36,7 @@
             <div class="recharge"><img src="./images/mall/recharge.png" alt=""></div>
         </div>
         <!-- 游戏区域 -->
-        <div class="game-area">
+        <div class="game-area" style="display: none;">
             <!-- 本轮轮次 -->
             <div class="roundId"></div>
             <!-- 选择时间 -->
@@ -50,8 +53,8 @@
 
                 </ul>
 
-                <div class="shelf"><img src="https://img.pekolive.com/cf-shelf.png" alt=""></div>
-                <div class="shelf"><img src="https://img.pekolive.com/cf-shelf.png" alt=""></div>
+                <div class="shelf"><img src="./images/shelf.png" alt=""></div>
+                <div class="shelf"><img src="./images/shelf.png" alt=""></div>
             </div>
             <!-- 等待结果 -->
             <div class="wait-time">
@@ -63,9 +66,9 @@
                 <div class="count-down">下一轮：<span class="count-down-num"></span>秒</div>
                 <div class="current-tip">本轮结果：<span class="current-result"></span></div>
                 <!-- 中奖物品展示 -->
-                <div class="draw-pic">
-                    <img src="" alt="">
-                </div>
+                <!-- <div class="draw-pic">
+                    <img src="http://beta.img.pekolive.com/FjWcbuxEpzZ8P3aS4A0n2llW9Jw9?imageslim" alt="">
+                </div> -->
                 <!-- 投入列表 -->
                 <div class="put-wrap">
                     <div class="put">投入</div>
@@ -73,7 +76,7 @@
                         <!-- <div class="item">
                             <p><img src="" class="gift" alt=""></p>
                             <div>
-                                <img src="cf-diamond.png" class="diamond" alt="">
+                                <img src="diamond.png" class="diamond" alt="">
                                 <span class="in"></span>
                             </div>
                         </div> -->
@@ -82,7 +85,7 @@
                 <!-- 用户本轮中奖情况 -->
                 <div class="award-info">
                     <div class="desc">奖励</div>
-                    <img src="https://img.pekolive.com/cf-diamond.png" class="diamond" alt="">
+                    <img src="./images/diamond.png" class="diamond" alt="">
                     <div class="award-wrap"></div>
                 </div>
                 <!-- 本轮前3名 -->
@@ -95,39 +98,50 @@
                     <div class="top-three-list">
                         <div class="no no1">
                             <img src="./images/logo.png" class="tx" alt="">
-                            <img src="https://img.pekolive.com/cf-no1.png" class="txBox" alt="">
+                            <img src="./images/no1.png" class="txBox" alt="">
                             <div class="nick">虚位以待</div>
                             <div class="num">
-                                <img src="https://img.pekolive.com/cf-diamond.png" class="diamond" alt="">
-                                <span></span>
+                                <img src="./images/diamond.png" class="diamond" alt="">
+                                <span>0</span>
                             </div>
                         </div>
                         <div class="no no2">
                             <img src="./images/logo.png" class="tx" alt="">
-                            <img src="https://img.pekolive.com/cf-no2.png" class="txBox" alt="">
+                            <img src="./images/no2.png" class="txBox" alt="">
                             <div class="nick">虚位以待</div>
                             <div class="num">
-                                <img src="https://img.pekolive.com/cf-diamond.png" class="diamond" alt="">
-                                <span></span>
+                                <img src="./images/diamond.png" class="diamond" alt="">
+                                <span>0</span>
                             </div>
                         </div>
                         <div class="no no3">
                             <img src="./images/logo.png" class="tx" alt="">
-                            <img src="https://img.pekolive.com/cf-no3.png" class="txBox" alt="">
+                            <img src="./images/no3.png" class="txBox" alt="">
                             <div class="nick">虚位以待</div>
                             <div class="num">
-                                <img src="https://img.pekolive.com/cf-diamond.png" class="diamond" alt="">
-                                <span></span>
+                                <img src="./images/diamond.png" class="diamond" alt="">
+                                <span>0</span>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
+            <!-- 动画上 -->
+            <div class="wait-time-s"></div>
+            <!-- 动画下 -->
+            <div class="wait-time-x"></div>
         </div>
 
         <!-- 往轮结果 -->
-        <div class="previous-result">
-            <span>往轮结果</span>
+        <div class="previous_Round_Result">
+            <span></span>
+            <div class="box">
+                <ul>
+                </ul>
+            </div>
+        </div>
+        <!-- <div class="previous-result">
+            <span>往輪結果</span>
             <div class="result-list">
                 <p><img src="" alt=""></p>
                 <p><img src="" alt=""></p>
@@ -139,10 +153,10 @@
                 <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="https://img.pekolive.com/cf-btn_result.png" alt=""></span>
+                <p><img src="" alt=""></p>
             </div>
+            <span class="more-result"><img src="./images/btn_result.png" alt=""></span>
+        </div> -->
 
         <!-- 个人信息 -->
         <div class="info-bottom">
@@ -151,8 +165,8 @@
                 <div class="diamond-num">我的鉆石：<span>0</span></div>
                 <div class="fragment-num">今日奖励：<span>0</span></div>
             </div>
-            <div class="add"><img src="https://img.pekolive.com/cf-add.png" alt=""></div>
-            <div class="rank"><img src="https://img.pekolive.com/cf-rank.png" alt=""></div>
+            <div class="add"><img src="./images/add.png" alt=""></div>
+            <div class="rank"><img src="./images/rank.png" alt=""></div>
         </div>
 
         <!-- 规则弹窗 -->
@@ -160,22 +174,22 @@
             <div class="shade-content">
                 <main>
                     <div class="cyfs">
-                        <p class="title">参与方式</p>
+                        <p class="title">參與方式</p>
                         用戶可通過花費鉆石參與《星級廚房》遊戲，每次最少消耗100鉆石，每回合時間30秒
-                        <p class="jietu"><img src="https://img.pekolive.com/cf-t1.png" alt=""></p>
+                        <p class="jietu"><img src="./images/t1.png" alt=""></p>
                     </div>
                     <div class="lwff">
-                        <p class="title">礼物发放</p>
-                        每次參與遊戲後會獲得一次禮物開獎機會
-                        <p class="jietu t2"><img src="https://img.pekolive.com/cf-t2.png" alt=""></p>
-                        每次隨機從8種食材中選取一個作為中獎物品，中獎後獲得【中獎物品購買碎片數*中獎物品對應倍數*100】的鉆石獎勵，鉆石將直接發放到錢包
-                        <p class="jietu t3"><img src="https://img.pekolive.com/cf-t3.png" alt=""></p>
-                        例如購買1個5倍的番茄，中獎後獲得1*5*100的鉆石
+                        <p class="title">禮物發放</p>
+                        每次參與遊戲後會獲得一次禮物開獎;
+                        <p class="jietu t2"><img src="./images/t2.png" alt=""></p>
+                        每次隨機從8種食材中選取一個或多個作為中獎食材，中獎後獲得（中獎物品所花費的鉆石數*中獎食材對應倍數）的鉆石獎勵，當中獎多個食材時，獲得的鉆石會同時發放。鉆石將直接發放到賬戶中。
+                        <p class="jietu t3"><img src="./images/t3.png" alt=""></p>
+                        例如購買1個5倍番茄花費100鉆，購買1個蘿蔔花費100鉆，中獎後將獲得100*5+100*5=1000鉆。
                     </div>
                     <div class="qtsm">
                         <p class="title">其他說明</p>
-                        如果以上說明未能解答您的疑問，請聯系客服，會有專人解答疑難
-                        <p>本活动与苹果公司无关</p>
+                        如果以上說明未能解答您的疑問，請聯繫客服，會有專人解答疑難
+                        <p>本活動與蘋果公司無關</p>
                     </div>
                 </main>
             </div>
@@ -226,12 +240,12 @@
     </div>
     <script src="../../common/js/flexible.js"></script>
     <script src="../../common/js/jquery-3.2.1.min.js"></script>
-    <script src="./js/jquery-animate-css-rotate-scale.js"></script>
     <script src="../../common/js/common2.js"></script>
+    <script src="./js/jquery-animate-css-rotate-scale.js"></script>
     <script src="../../common/js/layer.js"></script>
     <script src="../../common/js/vconsole.min.js"></script>
     <script src="../../common/js/svga.min.js"></script>
-    <script src="./js/index.js?v=2.1"></script>
+    <script src="./js/index.js?v=2.2"></script>
 </body>
 
 </html>

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

@@ -17,7 +17,8 @@ const showLoading = (content = '加載中...') => {
         shadeClose: false,
         content,
         success (e) {
-            layerIndex = $(e).attr('index')
+            layerIndex = $(e).attr('index');
+            $('.layui-m-layer').css("z-index", '9999');
         }
     })
 }
@@ -31,14 +32,19 @@ const toastMsg = (content = '操作完成', time = 2) => {
         skin: 'msg'
     })
 }
-
-if (!browser.app) { //false
+if (false) { //!browser.app
     toastMsg('請在app內打開！');
 } else {
     $('.wrap').removeClass('no-in-app')
 }
-
-
+console.log(document.body.clientWidth);
+console.log(document.body.clientHeight);
+if (document.body.clientHeight <= 700) {
+    $('body,html').css({ "height": '19.2rem' });
+}
+if (document.body.clientWidth >= 365) {
+    $('body,html').css({ "height": '19.2rem' });
+}
 // 獲取用戶相關信息
 let myFragment
 const getUserInfo = (param) => {
@@ -135,10 +141,10 @@ const getNewestAct = () => {
                     } else {
                         clearTimeout(timer2)
                         hideLoading(layerIndex)
-
                         roundId = res.data.roundId
                         $('.game-area .roundId').html(roundId)
                         getListItem(roundId, modelType)
+                        getPreviousResults(20, roundId)
 
                         // 進行下一輪時，arrTime重新置為空數組，不然在下一輪開始的時候也會執行location.reload()
                         if (roundIdArr.length < 2) {
@@ -161,7 +167,7 @@ const getNewestAct = () => {
                         showResultStageStartTime = res.data.showResultStageStartTime
                         endTime = res.data.endTime
                         console.log('獲取5個時間戳的值-----', 'timestamp:', userComeinTime, 'startTime:', startTime, 'drawStageStartTime:', drawStageStartTime, 'showResultStageStartTime:', showResultStageStartTime, 'endTime:', endTime);
-                        showView()
+                        showView(res.data.drawItemList)
                     }
                 }
             } else {
@@ -195,7 +201,7 @@ let mySelect
 let fragmentNum
 let reg = /^[0-9]*$/
 
-const showView = () => {
+const showView = (drawItemList) => {
     if (startTime <= userComeinTime && userComeinTime < drawStageStartTime) {
         // 第一階段
         console.log('進入第一階段');
@@ -217,11 +223,8 @@ const showView = () => {
 
         $('.award-wrap').html('').show()
         // $('.award-info .desc').html('')
-
-        getPreviousResults(10, roundId)
         showCountDown(userComeinTime, startTime, drawStageStartTime)
         getUserInfo()
-
     } else if (drawStageStartTime <= userComeinTime && userComeinTime < showResultStageStartTime) {
         // 第二階段
         console.log('進入第二階段');
@@ -239,16 +242,13 @@ const showView = () => {
         console.log('isStatus2的值------------', isStatus2);
 
         // $('.btn-wrap').find('div').removeClass('active')
-
-        getPreviousResults(10, roundId)
         showCountDown(userComeinTime, drawStageStartTime, showResultStageStartTime)
         judgeStatus()
         getUserInfo()
-
         // 播放5s動畫
         let player = new SVGA.Player('.wait-time');
         let parser = new SVGA.Parser('.wait-time');
-        parser.load('https://img.pekolive.com/cf-wait.svga', function (videoItem) {
+        parser.load('./images/wait1.svga', function (videoItem) {
             // player.loops = 2;
             player.clearsAfterStop = false;
             player.setVideoItem(videoItem);
@@ -268,9 +268,34 @@ const showView = () => {
         showCountDown(userComeinTime, showResultStageStartTime, endTime)
         judgeStatus()
         getUserInfo()
-        // getPreviousResults(10, roundId)
+        // 动画上
+        let player = new SVGA.Player('.wait-time-s');
+        let parser = new SVGA.Parser('.wait-time-s');
+        parser.load('./images/s.svga', function (videoItem) {
+            // player.loops = 2;
+            player.clearsAfterStop = false;
+            player.setVideoItem(videoItem);
+            player.startAnimation();
+        })
+        // 动画下
+        let player2 = new SVGA.Player('.wait-time-x');
+        let parser2 = new SVGA.Parser('.wait-time-x');
+        parser2.load('./images/x.svga', function (videoItem) {
+            // player.loops = 2;
+            player2.clearsAfterStop = false;
+            player2.setVideoItem(videoItem);
+            player2.startAnimation();
+        })
+        if (drawItemList.length > 1) {
+            $('.wait-time-s').show();
+            $('.wait-time-x').show();
+        } else {
+            $('.wait-time-s').hide();
+            $('.wait-time-x').hide();
         }
     }
+    $('.game-area').show();
+}
 
 // 顯示倒計時
 let countDownTime
@@ -401,7 +426,7 @@ const judgeStatus = () => {
                     drawInfo = res.data
                     img = res.data.drawImageUrl
                     if (isStatus3) {
-                        getPreviousResults(10, roundId)
+                        getPreviousResults(20, roundId)
                     }
                     renderDrawInfo()
                 } else {
@@ -425,8 +450,40 @@ const judgeStatus = () => {
 let topThreeArr = []
 const renderDrawInfo = () => {
     $('.draw-time .current-tip .current-result').html(drawInfo.drawName)
-    $('.draw-pic img').attr('src', drawInfo.drawImageUrl)
-
+    // $('.draw-pic img').attr('src', drawInfo.drawImageUrl)
+    $('.wrap .game-area .draw-time .draw-pic').remove();
+    var lenght = drawInfo.drawItemList.length;
+    var drawStr = '';
+    drawInfo.drawItemList.forEach(res => {
+        drawStr += `
+        <div class="draw-pic">
+            <img src="${res.drawImageUrl}" alt="">
+        </div>
+        `
+    })
+    $('.wrap .game-area .draw-time').append(drawStr);
+    if (lenght == 1) {
+        $('.wrap .game-area .draw-time').css({ "width": "55%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "50%", "height": "100%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "45%" });
+    } else if (lenght == 2) {
+        $('.wrap .game-area .draw-time').css({ "width": "55%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "50%", "height": "100%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "45%" });
+    } else if (lenght == 3) {
+        $('.wrap .game-area .draw-time').css({ "width": "70%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "33.3333%", "height": "75%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "40%" });
+    } else if (lenght == 4) {
+        $('.wrap .game-area .draw-time').css({ "width": "80%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "25%", "height": "65%", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "38%" });
+    } else if (lenght > 4) {
+        $('.wrap .game-area .draw-time').css({ "width": "55%", })
+        $('.wrap .game-area .draw-time .draw-pic').css({ "width": "1.3466666667rem", "height": "1.3466666667rem", });
+        $('.wrap .game-area .draw-time .draw-pic img').css({ "width": "0.8rem" });
+    }
+    // if()
     // if (isStatus3) {
     //     if (drawInfo.userDrawResult.drawStatus === 1) {
     //         $('.award-info .desc').html('恭喜你，猜中了！')
@@ -451,7 +508,7 @@ const renderDrawInfo = () => {
             <div class="item">
                 <p><img src="${res.imgUrl}" class="gift" alt=""></p>
                 <div>
-                    <img src="https://img.pekolive.com/cf-diamond.png" class="diamond" alt="">
+                    <img src="./images/diamond.png" class="diamond" alt="">
                     <span class="in">${res.costPieceNum}</span>
                 </div>
             </div>
@@ -484,8 +541,8 @@ const renderDrawInfo = () => {
         topThreeArr.map((item, index) => {
             $(`.top-three-list .no${index + 1} .tx`).attr('uid', item.uid)
             $(`.top-three-list .no${index + 1} .tx`).attr('src', item.avatar)
-            $(`.top-three-list .no${index + 1} .nick`).html(item.nick)
-            $(`.top-three-list .no${index + 1} .num span`).html(item.prizeDiamonds)
+            $(`.top-three-list .no${index + 1} .nick`).text(item.nick)
+            $(`.top-three-list .no${index + 1} .num span`).text(item.prizeDiamonds ? item.prizeDiamonds : '')
         })
     }
 
@@ -571,7 +628,6 @@ const renderListItem = () => {
 }
 
 // 獲取往輪遊戲結果 
-let previousResults = []
 const getPreviousResults = (count, roundId) => {
     networkRequest({
         type: 'GET',
@@ -582,8 +638,8 @@ const getPreviousResults = (count, roundId) => {
         },
         success (res) {
             if (res.code === 200) {
-                previousResults = res.data
-                renderPreviousResults()
+                // previousResults = res.data
+                renderPreviousResults(res.data)
             }
         },
         error (err) {
@@ -593,35 +649,46 @@ const getPreviousResults = (count, roundId) => {
 }
 
 // 渲染往輪遊戲結果
-const renderPreviousResults = () => {
-
+const renderPreviousResults = (val) => {
     let str = ''
-    if (previousResults.length < 5) {
-        let len = 5 - previousResults.length
+    if (val.length < 5) {
+        let len = 5 - val.length
         let arr = new Array(len).fill(1)
-        previousResults.push(...arr)
+        val.push(...arr)
     }
     if (isStatus3) {
         if (img) {
-            previousResults.pop()
-            previousResults.unshift({
+            val.pop()
+            val.unshift({
                 drawImageUrl: img
             })
-            console.log(previousResults);
+        }
+    }
+    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.drawImageUrl}" alt=""></p>`;
+            } else if (res.drawItemList.length == 2) {
+                return `<p style="width:0.6rem;height:0.6rem"><img  src="${item.drawImageUrl}" alt=""></p>`;
+            } else if (res.drawItemList.length == 3) {
+                return `<p style="width:0.45rem;height:0.45rem"><img  src="${item.drawImageUrl}" alt=""></p>`;
+            } else {
+                return `<p><img style="width:0.3333333333rem;height:0.3333333333rem" src="${item.drawImageUrl}" alt=""></p>`;
             }
 
+        }).join('')
             }
-    previousResults.map((item) => {
-        str += `
-            <p><img src="${item.drawImageUrl}" alt=""></p>
+            </li>
         `
     })
-    $('.result-list').html(str)
+    $('.wrap .previous_Round_Result .box ul').html(str)
 }
 
 // 發送用戶抽獎數量
 const sendUserDrawInfo = (itemId, num, tais) => {
-    showLoading();
+    // showLoading();
     networkRequest({
         type: 'POST',
         url: urlPrefix + '/act/luckySea/draw',
@@ -649,15 +716,18 @@ const sendUserDrawInfo = (itemId, num, tais) => {
                     })
                 hideLoading(layerIndex)
             } else if (31005) {
+                lock = !lock
                 toastMsg(res.message)
                 hideLoading(layerIndex)
             }
             else {
+                lock = !lock
                 toastMsg(res.message)
                 hideLoading(layerIndex)
             }
         },
         error (err) {
+            lock = !lock
             toastMsg('網絡錯誤，請退出重進')
             hideLoading(layerIndex)
         }
@@ -766,7 +836,7 @@ const renderMyInfo = () => {
             num = myInfoD.num
         }
         // $('.mine-diamond-num').html('今日獎勵' + num)
-        $('.mine-diamond-num').html(num)
+        $('.mine-diamond-num').html(num == 0 ? '—— ——' : num)
     } else {
         let erbanNo = myInfoN.erbanNo
         let myIndex = rankListN.findIndex((item, index) => {
@@ -784,7 +854,7 @@ const renderMyInfo = () => {
             myInfoN.nick = '未知'
         }
         $('.mine-info').find('.mine-nick').html(myInfoN.nick)
-        $('.mine-diamond-num').html('猜中' + myInfoN.num + '次')
+        $('.mine-diamond-num').html('猜中<b> ' + myInfoN.num + ' </b>次')
     }
 }
 
@@ -900,7 +970,7 @@ const renderRankList = () => {
         othersArr.map((item, index) => {
             let num
             if (item.erbanNo) {
-                num = '猜中' + item.num + '次'
+                num = '猜中<b> ' + item.num + ' </b>次'
             }
             others += `
                 <li uid="${item.uid}">
@@ -968,7 +1038,8 @@ $(function () {
                 }
             }
         })
-    }, 50)
+        // getPreviousResults(20, roundId)
+    }, 100)
 
     // 監聽按鈕點擊事件
     // let fragmentNum

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

@@ -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();
@@ -92,31 +92,33 @@ $(function () {
                     </div>
                     <div class="result-wrap">
                         <div class="result">
-                            <span>本輪結果</span>
-                            <div class="bg"><img src="${itemUrl}" alt=""></div>
+                            <span></span>
                         </div>
                         <div class="award">
                             <p>獎勵:</p>
                             <img src="./images/diamond.png" class="diamond" alt="">
                             <b>${res.reward}</b>
                         </div>
+                        <div class="result_sBox">
+                            ${res.drawItemList.map(item => {
+                    return `<div class="bg"><img src="${item.drawImageUrl}" alt=""></div>`
+                }).join('')}
+                        </div>
                     </div>
                     <div class="put-wrap">
-                        <div class="put">投入</div>
+                        <div class="put"></div>
                         <div class="list">
 
                         </div>
                     </div>
                 </li>
     `
-
             })
             $('.record-list').append(str)
 
 
             results.forEach((res, index) => {
                 res.forEach(val => {
-
                     $('.record-list li').eq(lisIndexId).find('.list').append(`
                     <div class= "item">
                         <p><img src="${val.itemUrl}" class="gift" alt=""></p>

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

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

@@ -14,7 +14,7 @@
 <body>
     <div class="result">
         <div class="header">
-            <img src="https://img.pekolive.com/cf-count-down.png" class="title" alt="">
+            <img src="./images/count-down.png" class="title" alt="">
             <span>前50轮中奖结果</span>
         </div>
         <ul class="main">

view/peko/activity/explore/css/index.css

@@ -120,6 +120,7 @@ body {
 }
 .mine .avatar img {
   width: 100%;
+  height: 100%;
   border-radius: 50%;
 }
 .mine .info-wrap {

view/peko/activity/explore/css/index.scss

@@ -152,6 +152,7 @@ body {
 
         img {
             width: 100%;
+            height: 100%;
             border-radius: 50%;
         }
     }

view/peko/common/js/common2.js

@@ -541,8 +541,8 @@ function getInfoFromClient () {
 
     } else {
         // 非app环境调试参数
-        pubInfo.uid = 2346;
-        pubInfo.ticket = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjoyMzQ2LCJ0aWNrZXRfaWQiOiJhOTY1YzkyYi1hZDM2LTRhZWItODk5OC1iN2UzODEyZjU2ZGYiLCJleHAiOjM2MDAsImNsaWVudF9pZCI6ImVyYmFuLWNsaWVudCJ9.AA-x5FwodxS9zimfJv4CTBXgD5-CPgVeoS-L6EU8VTI";
+        pubInfo.uid = 0;
+        pubInfo.ticket = "";
         // pubInfo.uid = "";
         // pubInfo.ticket = "";
 

view/peko/modules/room_rank/css/index.css

@@ -11,7 +11,7 @@
 body {
   width: 100%;
   font-family: "pingfang-bold";
-  background-color: #fff;
+  background-color: #7A83F5;
 }
 
 .wrap {
@@ -123,7 +123,7 @@ body {
 .wrap .rank_wrap .top_three_wrap .top_three_item .avatar {
   width: 2.32rem;
   height: 2.6666666667rem;
-  margin: 0.4533333333rem auto 0.32rem;
+  margin: 0.4533333333rem auto 0.2rem;
 }
 .wrap .rank_wrap .top_three_wrap .top_three_item .avatar p {
   position: relative;
@@ -143,7 +143,8 @@ body {
   display: flex;
   justify-content: center;
   align-items: center;
-  font-size: 0.32rem;
+  font-size: 0.3733333333rem;
+  white-space: nowrap;
 }
 .wrap .rank_wrap .top_three_wrap .top_three_item .nick img {
   width: 0.4rem;
@@ -157,23 +158,32 @@ body {
 }
 .wrap .rank_wrap .top_three_wrap .top_three_item .num {
   font-size: 0.3733333333rem;
-  color: #FF7979;
+  color: #F8FF7B;
+  padding-top: 0.05rem;
 }
 .wrap .rank_wrap ul {
   height: 3.7333333333rem;
-  margin-top: 0.4533333333rem;
+  padding-top: 0.4533333333rem;
+  background: linear-gradient(180deg, #8C6FFA 0%, #7A83F5 100%);
 }
 .wrap .rank_wrap ul li {
   display: flex;
   align-items: center;
-  margin-bottom: 0.4266666667rem;
+  padding-bottom: 0.4266666667rem;
+  background: #7A83F5;
+}
+.wrap .rank_wrap ul li:nth-child(1) {
+  background: transparent;
+}
+.wrap .rank_wrap ul li:nth-child(2) {
+  background: transparent;
 }
 .wrap .rank_wrap ul li .index {
   width: 0.4rem;
   text-align: center;
   font-size: 0.48rem;
   font-weight: bold;
-  color: #666;
+  color: #fff;
   margin: 0 0.5333333333rem;
 }
 .wrap .rank_wrap ul li .others_avatar {
@@ -194,7 +204,7 @@ body {
   height: 0.9333333333rem;
 }
 .wrap .rank_wrap ul li .info_wrap .others_nick {
-  color: #333;
+  color: #fff;
   font-size: 0.3733333333rem;
 }
 .wrap .rank_wrap ul li .info_wrap .others_nick img {
@@ -203,10 +213,10 @@ body {
   vertical-align: bottom;
 }
 .wrap .rank_wrap ul li .info_wrap .others_erbanNo {
-  color: rgba(102, 102, 102, 0.6);
+  color: rgba(255, 255, 255, 0.6);
 }
 .wrap .rank_wrap ul li .others_num {
-  color: #FF7979;
+  color: #F8FF7B;
   font-size: 0.3733333333rem;
   font-weight: bold;
   margin-right: 0.6666666667rem;

view/peko/modules/room_rank/css/index.scss

@@ -9,6 +9,7 @@
         url('../../../common/fonts/PingFang\ Bold.ttf') format('truetype'),
         url('../../../common/fonts/PingFang\ Bold.ttf') format('svg');
 }
+
 @font-face {
     font-family: 'pingfang-medium';
     src: url('../../../common/fonts/PingFang\ Medium.ttf');
@@ -20,11 +21,12 @@
 body {
     width: 100%;
     font-family: 'pingfang-bold';
-    background-color: #fff;
+    background-color: #7A83F5;
 }
 
 .wrap {
     display: none;
+
     .tab_wrap {
         position: fixed;
         top: 0;
@@ -34,6 +36,7 @@ body{
         height: px2rem(200, );
         background: url('../images/top.png') no-repeat 0 0/100% 100%;
         overflow: hidden;
+
         .tab_contain {
             display: flex;
             justify-content: space-between;
@@ -45,6 +48,7 @@ body{
             border-radius: px2rem(40, );
             color: rgba($color: #fff, $alpha: .6);
             font-size: px2rem(30, );
+
             p {
                 width: px2rem(312, );
                 height: px2rem(64, );
@@ -52,6 +56,7 @@ body{
                 margin: 0 px2rem(4, );
                 text-align: center;
                 font-weight: bold;
+
                 &.active {
                     background-color: #fff;
                     color: #7898F3;
@@ -59,16 +64,20 @@ body{
                 }
             }
         }
+
         .rank_type {
             display: flex;
             margin-left: px2rem(60, );
+
             p {
                 position: relative;
                 margin-right: px2rem(32, );
                 color: rgba($color: #fff, $alpha: .6);
                 font-size: px2rem(24, );
+
                 &.active {
                     color: rgba($color: #fff, $alpha: 1);
+
                     &::after {
                         content: '';
                         position: absolute;
@@ -81,12 +90,14 @@ body{
                         background-color: #fff;
                     }
                 }
+
                 &:last-child {
                     display: none;
                 }
             }
         }
     }
+
     .rank_wrap {
         overflow: auto;
 
@@ -96,6 +107,7 @@ body{
             height: px2rem(400, );
             background: url('../images/topthree-bg.png') no-repeat 0 0/100% 100%;
             margin-top: px2rem(200, );
+
             .top_three_item {
                 position: absolute;
                 left: 50%;
@@ -103,16 +115,21 @@ body{
                 width: px2rem(174, );
                 text-align: center;
                 color: #fff;
-                &:nth-child(2), &:nth-child(3){
+
+                &:nth-child(2),
+                &:nth-child(3) {
                     left: px2rem(60, );
                     transform: translateX(0);
+
                     .avatar {
                         width: px2rem(142, );
                         height: px2rem(164, );
                         margin-top: px2rem(112, );
+
                         p {
                             background-image: url('../images/second.png');
                         }
+
                         img {
                             top: px2rem(-132, );
                             width: px2rem(116, );
@@ -120,18 +137,22 @@ body{
                         }
                     }
                 }
+
                 &:nth-child(3) {
                     left: px2rem(516, );
+
                     .avatar {
                         p {
                             background-image: url('../images/third.png');
                         }
                     }
                 }
+
                 .avatar {
                     width: px2rem(174, );
                     height: px2rem(200, );
-                    margin: px2rem(34, ) auto px2rem(24, );
+                    margin: px2rem(34, ) auto 0.2rem;
+
                     p {
                         position: relative;
                         z-index: 99;
@@ -139,6 +160,7 @@ body{
                         height: 100%;
                         background: url('../images/first.png') no-repeat 0 0/100% 100%;
                     }
+
                     img {
                         position: relative;
                         top: px2rem(-160, );
@@ -147,25 +169,31 @@ body{
                         border-radius: 50%;
                     }
                 }
+
                 .nick {
                     display: flex;
                     justify-content: center;
                     align-items: center;
-                    font-size: px2rem(24, );
+                    font-size: px2rem(28, );
+                    white-space: nowrap;
+
                     img {
                         width: px2rem(30, );
                         width: px2rem(30, );
                         margin-left: px2rem(4, );
                     }
                 }
+
                 .erbanNo {
                     font-size: px2rem(20, );
                     color: rgba($color: #fff, $alpha: .6);
                     margin: px2rem(8, ) 0 px2rem(8, );
                 }
+
                 .num {
                     font-size: px2rem(28, );
-                    color: #FF7979;
+                    color: #F8FF7B;
+                    padding-top: 0.05rem;
                 }
             }
         }
@@ -173,50 +201,68 @@ body{
         ul {
             height: px2rem(280, );
             // overflow: auto;
-            margin-top: px2rem(34, );
+            padding-top: px2rem(34, );
+            background: linear-gradient(180deg, #8C6FFA 0%, #7A83F5 100%);
+
             li {
                 display: flex;
                 align-items: center;
-                margin-bottom: px2rem(32, );
+                padding-bottom: px2rem(32, );
+                background: #7A83F5;
+
+                &:nth-child(1){
+                    background: transparent;
+                }
+                &:nth-child(2){
+                    background: transparent;
+                }
+
                 .index {
                     width: px2rem(30, );
                     text-align: center;
                     font-size: px2rem(36, );
                     font-weight: bold;
-                    color: #666;
+                    color: #fff;
                     margin: 0 px2rem(40, );
                 }
+
                 .others_avatar {
                     width: px2rem(100, );
                     height: px2rem(100, );
                     margin-right: px2rem(32, );
+
                     img {
                         width: 100%;
                         height: 100%;
                         border-radius: 50%;
                     }
                 }
+
                 .info_wrap {
                     flex: 1;
                     display: flex;
                     flex-direction: column;
                     justify-content: space-around;
                     height: px2rem(70, );
+
                     .others_nick {
-                        color: #333;
+                        color: #fff;
                         font-size: px2rem(28, );
+
                         img {
                             width: px2rem(30, );
                             height: px2rem(30, );
                             vertical-align: bottom;
                         }
                     }
+
                     .others_erbanNo {
-                        color: rgba($color: #666, $alpha: .6);
+                        color: rgba($color: #fff, $alpha: .6);
                     }
                 }
+
                 .others_num {
-                    color: #FF7979;
+                    color: #F8FF7B;
                     font-size: px2rem(28, );
                     font-weight: bold;
                     margin-right: px2rem(50, );
@@ -229,4 +275,3 @@ body{
 ::-webkit-scrollbar {
     display: none;
 }
-

view/peko/modules/room_rank/index.html

@@ -7,7 +7,7 @@
     <title>房间榜单</title>
 
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/index.css?v=1.5">
+    <link rel="stylesheet" href="./css/index.css?v=1.8">
 </head>
 <body>
     <div class="wrap">
@@ -34,6 +34,6 @@
     <script src="../../common/js/common2.js"></script>
     <script src="../../common/js/layer.js"></script>
     <script src="../../common/js/vconsole.min.js"></script>
-    <script src="./js/index.js?v=1.7"></script>
+    <script src="./js/index.js?v=2.0"></script>
 </body>
 </html>

view/peko/modules/room_rank/js/index.js

@@ -72,8 +72,15 @@ const getShowInfo = () => {
 let page = 1
 let pageSize = 10
 let rankList = []
-let canNext = true
 let isLock = true
+let dayListNext = true
+let weekListNext = true
+let monthListNext = true
+let totalListNext = true
+let dayCharmListNext = true
+let weekCharmListNext = true
+let monthCharmListNext = true
+let totalCharmListNext = true
 
 // 获取财富榜数据
 const getList = (type, page = 1) => {
@@ -92,12 +99,50 @@ const getList = (type, page = 1) => {
             if (res.code === 200) {
                 if (res.data.rankings.length === pageSize) {
                     // 能够继续请求下一页
-                    canNext = true
+                    if (type == 'day') {
+                        dayListNext = true
+                    } else if (type == 'week') {
+                        weekListNext = true
+                    } else if (type == 'month') {
+                        monthListNext = true
                     } else {
-                    canNext = false
+                        totalListNext = true
+                    }
+                } else {
+                    if (type == 'day') {
+                        dayListNext = false
+                    } else if (type == 'week') {
+                        weekListNext = false
+                    } else if (type == 'month') {
+                        monthListNext = false
+                    } else {
+                        totalListNext = false
+                    }
                 }
                 rankList.push(...res.data.rankings)
-                renderList()
+                if (showMonthList) {
+                    if (type == 'day') {
+                        sessionStorage.setItem('dayList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('dayList'))
+                    } else if (type == 'week') {
+                        sessionStorage.setItem('weekList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('weekList'))
+                    } else if (type == 'month') {
+                        sessionStorage.setItem('monthList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('monthList'))
+                    }
+                } else {
+                    if (type == 'day') {
+                        sessionStorage.setItem('dayList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('dayList'))
+                    } else if (type == 'week') {
+                        sessionStorage.setItem('weekList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('weekList'))
+                    } else if (type == 'total') {
+                        sessionStorage.setItem('totalList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('totalList'))
+                    }
+                }
                 isLock = true
             } else {
                 toastMsg(res.message)
@@ -126,12 +171,52 @@ const getCharmList = (type, page = 1) => {
             if (res.code === 200) {
                 if (res.data.rankings.length === pageSize) {
                     // 能够继续请求下一页
-                    canNext = true
+                    if (type == 'day') {
+                        dayCharmListNext = true
+                    } else if (type == 'week') {
+                        weekCharmListNext = true
+                    } else if (type == 'month') {
+                        monthCharmListNext = true
                     } else {
-                    canNext = false
+                        totalCharmListNext = true
+                    }
+                } else {
+                    if (type == 'day') {
+                        dayCharmListNext = false
+                    } else if (type == 'week') {
+                        weekCharmListNext = false
+                    } else if (type == 'month') {
+                        monthCharmListNext = false
+                    } else {
+                        totalCharmListNext = false
+                    }
                 }
                 rankList.push(...res.data.rankings)
-                renderList()
+                if (showMonthList) {
+                    if (type == 'day') {
+                        sessionStorage.setItem('dayCharmList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('dayCharmList'))
+                    } else if (type == 'week') {
+                        sessionStorage.setItem('weekCharmList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('weekCharmList'))
+                    } else if (type == 'month') {
+                        sessionStorage.setItem('monthCharmList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('monthCharmList'))
+                    }
+                } else {
+                    if (type == 'day') {
+                        sessionStorage.setItem('dayCharmList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('dayCharmList'))
+                    } else if (type == 'week') {
+                        sessionStorage.setItem('weekCharmList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('weekCharmList'))
+                    } else if (type == 'total') {
+                        sessionStorage.setItem('totalCharmList', JSON.stringify(rankList))
+                        renderList(sessionStorage.getItem('totalCharmList'))
+                    }
+                }
+
+                // renderList()
                 isLock = true
             } else {
                 toastMsg(res.message)
@@ -143,10 +228,12 @@ const getCharmList = (type, page = 1) => {
     })
 }
 
-const renderList = () => {
-    let topThreeArr = rankList.slice(0, 3)
-    if (rankList.length < 3) {
-        let len = 3 - rankList.length
+const renderList = (List) => {
+    let list = JSON.parse(List)
+    rankList = list
+    let topThreeArr = list.slice(0, 3)
+    if (list.length < 3) {
+        let len = 3 - list.length
         let arr = new Array(len).fill({
             nick: '',
             erbanNo: '',
@@ -175,12 +262,12 @@ const renderList = () => {
                         <p></p>
                         <img src="${item.avatar ? item.avatar : `./images/${index + 1}.png`}" alt="">
                     </div>
-                    <div class="nick"}>
+                    <div class="nick">
                         ${item.nick.length > 5 ? item.nick.slice(0, 5) + '...' : item.nick}
                         <img src="${item.gender == 1 ? './images/male.png' : './images/female.png'}" alt="" class='gender' style='display:${item.gender ? 'inline-block' : 'none'}'>
                     </div>
-                    <div class="erbanNo"}><span>${item.erbanNo ? 'ID:' + item.erbanNo : ''}</span></div>
-                    <div class="num"}>${goldAmount ? goldAmount : ''}</div>
+                    <div class="erbanNo"><span>${item.erbanNo ? 'ID:' + item.erbanNo : ''}</span></div>
+                    <div class="num">${goldAmount ? goldAmount : ''}</div>
                 </div>
             `
     })
@@ -188,7 +275,7 @@ const renderList = () => {
 
 
     // 渲染非前3
-    let othersArr = rankList.slice(3)
+    let othersArr = list.slice(3)
     let others = ''
     othersArr.map((item, index) => {
         let tostr = item.goldAmount.toString()
@@ -240,21 +327,45 @@ $(function () {
             if (showMonthList) {
                 $('.wrap .tab_wrap .rank_type p:last-child').show();
                 if (currentCharmRankType == 0) {
+                    if (sessionStorage.getItem('dayCharmList')) {
+                        renderList(sessionStorage.getItem('dayCharmList'))
+                    } else {
                         getCharmList('day')
+                    }
                 } else if (currentCharmRankType == 1) {
+                    if (sessionStorage.getItem('weekCharmList')) {
+                        renderList(sessionStorage.getItem('weekCharmList'))
+                    } else {
                         getCharmList('week')
+                    }
                 } else if (currentCharmRankType == 2) {
+                    if (sessionStorage.getItem('monthCharmList')) {
+                        renderList(sessionStorage.getItem('monthCharmList'))
+                    } else {
                         getCharmList('month')
                     }
+                }
             } else {
                 if (currentCharmRankType == 0) {
+                    if (sessionStorage.getItem('dayCharmList')) {
+                        renderList(sessionStorage.getItem('dayCharmList'))
+                    } else {
                         getCharmList('day')
+                    }
                 } else if (currentCharmRankType == 1) {
+                    if (sessionStorage.getItem('weekCharmList')) {
+                        renderList(sessionStorage.getItem('weekCharmList'))
+                    } else {
                         getCharmList('week')
+                    }
                 } else if (currentCharmRankType == 2) {
+                    if (sessionStorage.getItem('totalCharmList')) {
+                        renderList(sessionStorage.getItem('totalCharmList'))
+                    } else {
                         getCharmList('total')
                     }
                 }
+            }
         } else {
             // 贡献榜&爱意榜
             if (showReceiveRankTotal) {
@@ -264,23 +375,47 @@ $(function () {
                 $('.wrap .tab_wrap .rank_type p:last-child').show();
                 $('.rank_type p').eq(currentRankType).addClass('active').siblings('p').removeClass('active')
                 if (currentRankType == 0) {
+                    if (sessionStorage.getItem('dayList')) {
+                        renderList(sessionStorage.getItem('dayList'))
+                    } else {
                         getList('day')
+                    }
                 } else if (currentRankType == 1) {
+                    if (sessionStorage.getItem('weekList')) {
+                        renderList(sessionStorage.getItem('weekList'))
+                    } else {
                         getList('week')
+                    }
                 } else if (currentRankType == 2) {
+                    if (sessionStorage.getItem('monthList')) {
+                        renderList(sessionStorage.getItem('monthList'))
+                    } else {
                         getList('month')
                     }
+                }
             } else {
                 $('.rank_type p').eq(currentRankType).addClass('active').siblings('p').removeClass('active')
                 if (currentRankType == 0) {
+                    if (sessionStorage.getItem('dayList')) {
+                        renderList(sessionStorage.getItem('dayList'))
+                    } else {
                         getList('day')
+                    }
                 } else if (currentRankType == 1) {
+                    if (sessionStorage.getItem('weekList')) {
+                        renderList(sessionStorage.getItem('weekList'))
+                    } else {
                         getList('week')
+                    }
                 } else if (currentRankType == 2) {
+                    if (sessionStorage.getItem('totalList')) {
+                        renderList(sessionStorage.getItem('totalList'))
+                    } else {
                         getList('total')
                     }
                 }
             }
+        }
     })
 
     // 日榜周榜总榜切换
@@ -299,21 +434,47 @@ $(function () {
 
             if (showMonthList) {
                 if (index == 0) {
+                    if (sessionStorage.getItem('dayCharmList')) {
+                        renderList(sessionStorage.getItem('dayCharmList'))
+                    } else {
                         getCharmList('day')
+                    }
+
                 } else if (index == 1) {
+                    if (sessionStorage.getItem('weekCharmList')) {
+                        renderList(sessionStorage.getItem('weekCharmList'))
+                    } else {
                         getCharmList('week')
+                    }
                 } else if (index == 2) {
+                    if (sessionStorage.getItem('monthCharmList')) {
+                        renderList(sessionStorage.getItem('monthCharmList'))
+                    } else {
                         getCharmList('month')
                     }
+                }
             } else {
                 if (index == 0) {
+                    if (sessionStorage.getItem('dayCharmList')) {
+                        renderList(sessionStorage.getItem('dayCharmList'))
+                    } else {
                         getCharmList('day')
+                    }
+
                 } else if (index == 1) {
+                    if (sessionStorage.getItem('weekCharmList')) {
+                        renderList(sessionStorage.getItem('weekCharmList'))
+                    } else {
                         getCharmList('week')
+                    }
                 } else if (index == 2) {
+                    if (sessionStorage.getItem('totalCharmList')) {
+                        renderList(sessionStorage.getItem('totalCharmList'))
+                    } else {
                         getCharmList('total')
                     }
                 }
+            }
         } else {
             // 财富榜
             let index = $(this).index()
@@ -323,22 +484,48 @@ $(function () {
             rankList = []
             if (showMonthList) {
                 if (index == 0) {
+                    if (sessionStorage.getItem('dayList')) {
+                        renderList(sessionStorage.getItem('dayList'))
+                    } else {
                         getList('day')
+                    }
+
                 } else if (index == 1) {
+                    if (sessionStorage.getItem('weekList')) {
+                        renderList(sessionStorage.getItem('weekList'))
+                    } else {
                         getList('week')
+                    }
                 } else if (index == 2) {
+                    if (sessionStorage.getItem('monthList')) {
+                        renderList(sessionStorage.getItem('monthList'))
+                    } else {
                         getList('month')
                     }
+                }
             } else {
                 if (index == 0) {
+                    if (sessionStorage.getItem('dayList')) {
+                        renderList(sessionStorage.getItem('dayList'))
+                    } else {
                         getList('day')
+                    }
+
                 } else if (index == 1) {
+                    if (sessionStorage.getItem('weekList')) {
+                        renderList(sessionStorage.getItem('weekList'))
+                    } else {
                         getList('week')
+                    }
                 } else if (index == 2) {
+                    if (sessionStorage.getItem('totalList')) {
+                        renderList(sessionStorage.getItem('totalList'))
+                    } else {
                         getList('total')
                     }
                 }
             }
+        }
     })
 
     // 监听滚动
@@ -349,46 +536,58 @@ $(function () {
         if (scrollTop + ulHeight + 100 >= scrollHeight) {
             if (isLock) {
                 // 请求下一页
-                if (canNext) {
+                // if (canNext) {
                 if (showMonthList) {
                     if (currentTabIndex) {
                         if (currentCharmRankType == 0) {
+                            if (!dayCharmListNext) return
                             getCharmList('day', ++page)
                         } else if (currentCharmRankType == 1) {
+                            if (!weekCharmListNext) return
                             getCharmList('week', ++page)
                         } else if (currentCharmRankType == 2) {
+                            if (!monthCharmListNext) return
                             getCharmList('month', ++page)
                         }
                     } else {
                         if (currentRankType == 0) {
+                            if (!dayListNext) return
                             getList('day', ++page)
                         } else if (currentRankType == 1) {
+                            if (!weekListNext) return
                             getList('week', ++page)
                         } else if (currentRankType == 2) {
+                            if (!monthListNext) return
                             getList('month', ++page)
                         }
                     }
                 } else {
                     if (currentTabIndex) {
                         if (currentCharmRankType == 0) {
+                            if (!dayCharmListNext) return
                             getCharmList('day', ++page)
                         } else if (currentCharmRankType == 1) {
+                            if (!weekCharmListNext) return
                             getCharmList('week', ++page)
                         } else if (currentCharmRankType == 2) {
+                            if (!totalCharmListNext) return
                             getCharmList('total', ++page)
                         }
                     } else {
                         if (currentRankType == 0) {
+                            if (!dayListNext) return
                             getList('day', ++page)
                         } else if (currentRankType == 1) {
+                            if (!weekListNext) return
                             getList('week', ++page)
                         } else if (currentRankType == 2) {
+                            if (!totalListNext) return
                             getList('total', ++page)
                         }
                     }
                 }
                 isLock = false
-                }
+                // }
             }
         }
     })

view/peko/modules/rule/privacy-wap.html

@@ -116,12 +116,15 @@
       <p>
         11.我们会使用第三方消息推送功能，包括手机厂商push推送、特定事件提醒，用于提醒您的应用消息或活动事件，我们可能会发送广播唤醒APP自启动或关联启动，您可以在系统设置里拒绝提供，如果拒绝提供您将可能无法获得相关服务，但不影响其他功能的正常使用。
       </p>
-      <p>12.我们不会收集您的聊天记录。您在<span class="name">peko</span>中的聊天记录会存储在您的终端设备，您可以选择自行备份、删除或在不同设备中转移。</p>
       <p>
-        13.如果您联系我们的客服，我们可能需要您提供必要的个人信息进行身份验证，以保证您的帐号安全。为根据您的诉求提供服务，经过您的授权，人工客服人员需要在您授权范围内查询或核验您的相关信息，我们将尽可能采取技术和管理措施保障您的信息安全和保密，并在必要范围内进行使用。我们可能还会保存您的联系方式（您使用的或主动提供的手机号码、微信号、QQ号或其他联系方式）、您与我们的通信记录和内容，以及其他必要信息，以便为您提供和记录客户服务。
+        12.为了提供分享功能，我们的产品集成友盟+SDK，SDK将采集您的设备标识和您需要分享的社交账户。当您需要使用一键分享服务，友盟+ U-Share SDK，将收集您的设备标识信息（如IMEI/android ID/IDFA等）和您需要分享的社交账户公开信息，以便完成一键分享服务。为了您的信息安全，我们已与第三方SDK服务商进行数据安全保密约定，这些公司会严格遵守我们的数据隐私和安全要求。除非得到您的同意，我们不会与其共享您的个人身份信息。
+      </p>
+      <p>13.我们不会收集您的聊天记录。您在<span class="name">peko</span>中的聊天记录会存储在您的终端设备，您可以选择自行备份、删除或在不同设备中转移。</p>
+      <p>
+        14.如果您联系我们的客服，我们可能需要您提供必要的个人信息进行身份验证，以保证您的帐号安全。为根据您的诉求提供服务，经过您的授权，人工客服人员需要在您授权范围内查询或核验您的相关信息，我们将尽可能采取技术和管理措施保障您的信息安全和保密，并在必要范围内进行使用。我们可能还会保存您的联系方式（您使用的或主动提供的手机号码、微信号、QQ号或其他联系方式）、您与我们的通信记录和内容，以及其他必要信息，以便为您提供和记录客户服务。
       </p>
       <p>
-        14.为帮助我们更好地了解<span class="name">peko</span>及相关服务的运行情况，以便确保运行与提供服务的安全，我们可能记录网络日志信息，以及使用软件及相关服务的频率、崩溃数据、总体安装、使用情况、性能数据信息。
+        15.为帮助我们更好地了解<span class="name">peko</span>及相关服务的运行情况，以便确保运行与提供服务的安全，我们可能记录网络日志信息，以及使用软件及相关服务的频率、崩溃数据、总体安装、使用情况、性能数据信息。
       </p>
       <p>更多详情请见 <a href="./permissions.html" style="color: rgb(4, 172, 238);">《设备权限清单》</a>
         ，您不同意开启特定权限通常只影响您使用其对应的特定功能。</p>

view/peko/modules/rule/sdk.html

@@ -62,30 +62,18 @@
             <span class="font-bold">个人信息类型</span> ：定位权限，网络访问，wifi状态访问，运营商信息，设备信息（IMEI/Mac/Android ID/IDFA/OPENUDID/GUID/SIM 卡 IMSI /地理位置），获取设备序列号<br>
             <span class="font-bold">第三方隐私政策链接</span>：https://www.umeng.com/page/policy <br>
         </li><br>
+        <li>
+            <span class="font-bold">SDK名称</span>： 友盟+ U-Share SDK <br>
+            <span class="font-bold">使用目的</span>： 一键分享<br>
+            <span class="font-bold">个人信息类型</span> ：设备标识信息（如IMEI/android ID/IDFA等）、社交账户公开信息<br>
+            <span class="font-bold">第三方隐私政策链接</span>：https://www.umeng.com/policy <br>
+        </li><br>
         <li>
             <span class="font-bold">SDK名称</span>： MobTech SDK <br>
             <span class="font-bold">使用目的</span>： 提供准时的消息推送和通知功能，用于测试移动跨平台开发工具的示例应用程序<br>
             <span class="font-bold">个人信息类型</span>：系统运营信息，网络访问，获取MAC，获取IMEI信息，获取匿名设备标识符（OAID）、国际移动用户识别码（IMSI），获取系统安装的应用程序，基站信息，获取运行中进程信息<br>
             <span class="font-bold">第三方隐私政策链接</span>： https://www.mob.com/about/policy <br>
         </li><br>
-        <!-- <li>
-            <span class="font-bold">SDK名称</span>： Linkedme <br>
-            <span class="font-bold">使用目的</span>： 实现跨应用打开app并完成页面还原功能<br>
-            <span class="font-bold">个人信息类型</span>：系统运营信息，网络访问，获取MAC，获取IMEI信息，获取匿名设备标识符（OAID），剪切板访问，读写器外部存储，设备信息，运营商信息,设备信息（IMEI/Mac/Android ID/IDFA/OPENUDID/GUID/SIM 卡 IMSI /地理位置）<br>
-            <span class="font-bold">第三方隐私政策链接</span>： https://www.linkedme.cc/privacy-policy.html <br>
-        </li><br> -->
-        <li>
-            <span class="font-bold">SDK名称</span>： 腾讯bugly <br>
-            <span class="font-bold">使用目的</span>： 实现上报程序bug信息的功能<br>
-            <span class="font-bold">个人信息类型</span>：电话状态，读写器外部存储，网络访问，wifi状态访问，获取IMSI信息，获取系统安装的应用程序，设备信息（IMEI/Mac/Android ID/IDFA/OPENUDID/GUID/SIM 卡 IMSI /地理位置）<br>
-            <span class="font-bold">第三方隐私政策链接</span>：https://privacy.qq.com/document/priview/fbd2c3f898df4c1c869925dd49d57827<br>
-        </li><br>
-        <li>
-            <span class="font-bold">SDK名称</span>： OAID <br>
-            <span class="font-bold">使用目的</span>：用于产品在应用市场的个性化广告投放功能<br>
-            <span class="font-bold">个人信息类型</span>电话状态，网络访问<br>
-            <span class="font-bold">第三方隐私政策链接</span>：http://www.msa-alliance.cn/col.jsp?id=120<br>
-        </li><br>
         <li>
             <span class="font-bold">SDK名称</span>： 网易易盾 <br>
             <span class="font-bold">使用目的</span>： 实现一键登录功能，实现内容过滤功能<br>
@@ -104,42 +92,12 @@
             <span class="font-bold">个人信息类型</span>网络访问，读写外部存储<br>
             <span class="font-bold">第三方隐私政策链接</span>：https://developer.qiniu.com/pili/8027/sdk-privacy-policy<br>
         </li><br>
-        <li>
-            <span class="font-bold">SDK名称</span>： 阿里云实人认证 <br>
-            <span class="font-bold">使用目的</span>： 实现人脸识别功能<br>
-            <span class="font-bold">个人信息类型</span>电话状态，读写外部存储，访问摄像头权限，获取系统安装的应用信息，运营商信息，获取IMEI信息，获取IMSI信息，获取MAC，获取运行中进程信息<br>
-            <span class="font-bold">第三方隐私政策链接</span>：http://terms.aliyun.com/legal-agreement/terms/suit_bu1_ali_cloud/suit_bu1_ali_cloud201902141711_54837.html?spm=5176.156174.J_9220772140.78.37bd5575NoBig0<br>
-        </li><br>
-        <li>
-            <span class="font-bold">SDK名称</span>： 支付宝 <br>
-            <span class="font-bold">使用目的</span>： 唤起支付宝app完成支付<br>
-            <span class="font-bold">个人信息类型</span>手机状态和身份，存储卡内容，获取IMSI信息，获取运行中进程信息<br>
-            <span class="font-bold">第三方隐私政策链接</span>：https://render.alipay.com/p/c/k2h4n8ug<br>
-        </li><br>
-        <li>
-            <span class="font-bold">SDK名称</span>： 微信 <br>
-            <span class="font-bold">使用目的</span>：唤起微信app完成支付<br>
-            <span class="font-bold">个人信息类型</span>手机状态和身份，存储卡内容<br>
-            <span class="font-bold">第三方隐私政策链接</span>：https://weixin.qq.com/cgi-bin/readtemplate?lang=zh_CN&t=weixin_agreement&s=privacy<br>
-        </li><br>
-        <li>
-            <span class="font-bold">SDK名称</span>： Zego <br>
-            <span class="font-bold">使用目的</span>：提供实时音视频云服务<br>
-            <span class="font-bold">个人信息类型</span>录音麦克风权限，摄像头权限，电话状态，wifi状态访问，网络状态，运营商信息，蓝牙访问，网络访问，修改音频设置，读写外部存储，保持设备唤醒<br>
-            <span class="font-bold">第三方隐私政策链接</span>：https://www.zego.im/privacy<br>
-        </li><br>
         <li>
             <span class="font-bold">SDK名称</span>： 声网 <br>
             <span class="font-bold">使用目的</span>：提供实时音视频云服务<br>
             <span class="font-bold">个人信息类型</span>录音麦克风权限，摄像头权限，电话状态，wifi状态访问，网络状态，运营商信息，蓝牙访问，网络访问，修改音频设置，读写外部存储，保持设备唤醒<br>
             <span class="font-bold">第三方隐私政策链接</span>：https://www.agora.io/cn/privacy-policy<br>
         </li><br>
-        <li>
-            <span class="font-bold">SDK名称</span>： 无界 <br>
-            <span class="font-bold">使用目的</span>： 提供实时音视频云服务<br>
-            <span class="font-bold">个人信息类型</span>录音麦克风权限，摄像头权限，电话状态，wifi状态访问，网络状态，运营商信息，蓝牙访问，网络访问，修改音频设置，读写外部存储，保持设备唤醒<br>
-            <span class="font-bold">第三方隐私政策链接</span>：https://wujiecloud.com/agreement<br>
-        </li><br>
         <li>
             <span class="font-bold">SDK名称</span>： 腾讯云视立方音视频通话 TRTC SDK <br>
             <span class="font-bold">使用目的</span>： 提供实时音视频云服务<br>