修复不选择充值档位的情况下 仍然可以发起支付问题

view/peko/common/js/common2.js

@@ -529,11 +529,13 @@ function getInfoFromClient () {
         console.log('从客户端获取了用户信息（设备信息），此信息来源：common2.js');
         if (browser.android) {
             pubInfo.uid = methodsFromClient.uid.android();
+            pubInfo.roomUid = methodsFromClient.roomUid.android();
             pubInfo.ticket = methodsFromClient.ticket.android();
             pubInfo.deviceId = methodsFromClient.deviceId.android();
             pubInfo.deviceInfo = methodsFromClient.deviceInfo.android();
         } else {
             methodsFromClient.uid.ios();
+            methodsFromClient.roomUid.ios();
             methodsFromClient.ticket.ios();
             methodsFromClient.deviceId.ios();
             methodsFromClient.deviceInfo.ios();
@@ -793,4 +795,13 @@ function networkRequest (reqObj = {}, type) {
 
     const response = $.ajax(reqObj);
     return response;
+}
+// 控制body是否可以滑动
+function bodyScroolFun (bool) {
+    if (bool) {
+        $('body').css('overflow', 'hidden');
+    } else {
+        $('body').css('overflow', 'auto');
+
+    }
 }

view/peko/modules/h5Income/chainBank.html

@@ -36,7 +36,7 @@
         </div>
         <div>
             <span>手機號碼</span>
-            <input class="phone" type="number" placeholder="請輸入手機號碼">
+            <input class="phone" type="text" placeholder="請輸入手機號碼">
         </div>
         <div>
             <span>支付寶號</span>

view/peko/modules/h5Income/js/chainBank.js

@@ -178,7 +178,12 @@ $('.but').click(function () {
             toastMsg('請上傳身份證');
             return;
         }
-        withdrawUserAccount($('.box1 div .name').val(), $('.box1 div .card').val(), $('.box2 div .bankCard').val(), $('.box2 div .phone').val(), $('.box2 div .alipay').val(), $('.box2 div .address').val(),
+        withdrawUserAccount($('.box1 div .name').val(),
+            $('.box1 div .card').val(),
+            $('.box2 div .bankCard').val(),
+            $('.box2 div .phone').val(),
+            $('.box2 div .alipay').val(),
+            $('.box2 div .address').val(),
             $('.box3 .idBox .z .documents').attr('src'),
             $('.box3 .idBox .f .documents').attr('src'));
     }

view/peko/modules/luckyTarot/css/index.css

@@ -0,0 +1,618 @@
+body {
+  width: 100%;
+  height: 21.6533333333rem;
+  background: url(../images/bg.png) no-repeat;
+  background-size: 100% 100%;
+  margin: 0 auto;
+  position: relative;
+  box-sizing: border-box;
+  padding-top: 2.0933333333rem;
+}
+
+.back {
+  position: fixed;
+  top: 0.9333333333rem;
+  left: 0.4533333333rem;
+  z-index: 9999;
+  width: 0.8266666667rem;
+  height: 0.8266666667rem;
+}
+.back img {
+  width: 100%;
+  height: 100%;
+}
+.back p {
+  color: #fff;
+  font-size: 0.4266666667rem;
+  position: absolute;
+  width: 9rem;
+  left: 0;
+  top: 0;
+  height: 100%;
+  text-align: center;
+  line-height: 0.8266666667rem;
+}
+
+.header {
+  width: 9.12rem;
+  height: 3.04rem;
+  margin: 0 auto 0rem;
+  display: block;
+  position: relative;
+  z-index: 3;
+}
+
+.roulette {
+  width: 10rem;
+  height: 11.3333333333rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 0rem;
+}
+.roulette .roulette_in {
+  width: 100%;
+  height: 100%;
+}
+.roulette .roulette_in canvas {
+  width: 100%;
+  height: 100%;
+}
+
+.gold_10 {
+  width: 6.4266666667rem;
+  height: 0.6933333333rem;
+  margin: 0rem auto 0.2666666667rem;
+  display: block;
+  position: relative;
+  z-index: 3;
+}
+
+.rule {
+  width: 0.68rem;
+  height: 1.8666666667rem;
+  background: url(../images/icon.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  top: 2.8133333333rem;
+  right: 0;
+  color: #FFE7A9;
+  font-size: 0.2933333333rem;
+  text-align: center;
+  padding: 0.3333333333rem 0.1333333333rem 0.3066666667rem 0.2666666667rem;
+  box-sizing: border-box;
+  z-index: 3;
+}
+
+.record {
+  width: 0.68rem;
+  height: 1.8666666667rem;
+  background: url(../images/icon.png) no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  top: 4.8533333333rem;
+  right: 0;
+  color: #FFE7A9;
+  font-size: 0.2933333333rem;
+  text-align: center;
+  padding: 0.3333333333rem 0.1333333333rem 0.3066666667rem 0.2666666667rem;
+  box-sizing: border-box;
+  z-index: 9;
+}
+
+.tarotBox {
+  width: 9.8266666667rem;
+  height: 14.1333333333rem;
+  background: url(../images/middleBg.png) no-repeat;
+  background-size: 100% 100%;
+  margin: 0 auto 0;
+  position: relative;
+}
+.tarotBox .tabBox {
+  width: 9.56rem;
+  height: 1.3066666667rem;
+  display: flex;
+  justify-content: space-between;
+  background: url(../images/tabBox.png) no-repeat;
+  background-size: 100% 100%;
+  margin: 0 auto;
+}
+.tarotBox .tabBox div {
+  width: 3.3733333333rem;
+  height: 100%;
+  color: #FEF0C0;
+  font-size: 0.3733333333rem;
+  text-align: center;
+  box-sizing: border-box;
+  padding-top: 0.3466666667rem;
+}
+.tarotBox .tabBox div b {
+  color: #FEF0C0;
+  font-size: 0.24rem;
+  margin-top: 0.04rem;
+  display: block;
+}
+.tarotBox .tabBox .active1 {
+  background: url(../images/active1.png) no-repeat;
+  background-size: 100% 100%;
+  color: #FFFFFF;
+}
+.tarotBox .tabBox .active1 b {
+  color: #FFFFFF;
+}
+.tarotBox .tabBox .active2 {
+  background: url(../images/active2.png) no-repeat;
+  background-size: 100% 100%;
+  color: #FFFFFF;
+}
+.tarotBox .tabBox .active2 b {
+  color: #FFFFFF;
+}
+.tarotBox .tabBox .active3 {
+  background: url(../images/active3.png) no-repeat;
+  background-size: 100% 100%;
+  color: #FFFFFF;
+}
+.tarotBox .tabBox .active3 b {
+  color: #FFFFFF;
+}
+.tarotBox .gradeText {
+  position: absolute;
+  left: 0.9866666667rem;
+  top: 1.4666666667rem;
+  color: #FFEAA9;
+  font-size: 0.32rem;
+}
+.tarotBox .diamond {
+  min-width: 1.9733333333rem;
+  height: 0.5866666667rem;
+  border-radius: 0.5866666667rem;
+  line-height: 0.5866666667rem;
+  position: absolute;
+  right: 0.96rem;
+  top: 1.28rem;
+  background: #343662;
+  color: #FFFFFF;
+  border: 0.0133333333rem solid #FFF3B1;
+  box-sizing: border-box;
+  vertical-align: middle;
+}
+.tarotBox .diamond .diamondIcon {
+  display: inline-block;
+  width: 0.3866666667rem;
+  height: 0.28rem;
+  margin-top: 0.16rem;
+  margin-left: 0.1733333333rem;
+}
+.tarotBox .diamond b {
+  font-size: 0.2666666667rem;
+  display: inline-block;
+  margin: 0 0.0933333333rem;
+}
+.tarotBox .diamond .add {
+  width: 0.24rem;
+  height: 0.24rem;
+  display: inline-block;
+  margin-top: 0.1733333333rem;
+  margin-right: 0.1866666667rem;
+}
+.tarotBox .cardBox {
+  width: 1.9733333333rem;
+  height: 3.2133333333rem;
+  position: absolute;
+  z-index: 3;
+}
+.tarotBox .card1 {
+  background: url(../images/card.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card2 {
+  background: url(../images/card2.png) no-repeat;
+  background-size: 100% 100%;
+  display: none;
+}
+.tarotBox .card3 {
+  background: url(../images/card3.png) no-repeat;
+  background-size: 100% 100%;
+  display: none;
+}
+.tarotBox .card1_active {
+  background: url(../images/card1_active.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card2_active {
+  background: url(../images/card2_active.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card3_active {
+  background: url(../images/card3_active.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card_not {
+  background: url(../images/not.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card_winning1 {
+  background: url(../images/winning1.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card_winning2 {
+  background: url(../images/winning2.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .card_winning3 {
+  background: url(../images/winning3.png) no-repeat;
+  background-size: 100% 100%;
+}
+.tarotBox .cardBox0 {
+  left: 0.9466666667rem;
+  top: 2.0933333333rem;
+}
+.tarotBox .cardBox1 {
+  left: 2.9866666667rem;
+  top: 2.0933333333rem;
+}
+.tarotBox .cardBox2 {
+  left: 5.04rem;
+  top: 2.0933333333rem;
+}
+.tarotBox .cardBox3 {
+  left: 7.08rem;
+  top: 2.0933333333rem;
+}
+.tarotBox .cardBox4 {
+  left: 7.08rem;
+  top: 5.52rem;
+}
+.tarotBox .cardBox5 {
+  left: 7.08rem;
+  top: 8.8533333333rem;
+}
+.tarotBox .cardBox6 {
+  left: 5.04rem;
+  top: 8.8533333333rem;
+}
+.tarotBox .cardBox7 {
+  left: 2.9866666667rem;
+  top: 8.8533333333rem;
+}
+.tarotBox .cardBox8 {
+  left: 0.9466666667rem;
+  top: 8.8533333333rem;
+}
+.tarotBox .cardBox9 {
+  left: 0.9466666667rem;
+  top: 5.52rem;
+}
+.tarotBox .cardBoxBut {
+  width: 2.5066666667rem;
+  height: 0.9866666667rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 7.4666666667rem;
+  z-index: 3;
+}
+.tarotBox .butAgain {
+  width: 2.5066666667rem;
+  height: 0.9866666667rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 7.4666666667rem;
+  display: none;
+  z-index: 3;
+}
+.tarotBox .gonggao {
+  width: 100%;
+  height: 1.3rem;
+  box-sizing: border-box;
+  position: absolute;
+  left: 0;
+  top: 12.25rem;
+  overflow: hidden;
+}
+.tarotBox .gonggao .ul1 {
+  width: 100%;
+  height: 100%;
+}
+.tarotBox .gonggao .ul1 li {
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-size: 0.32rem;
+  margin-bottom: 0.1466666667rem;
+}
+.tarotBox .gonggao .ul1 li b {
+  color: #FFEAA9;
+}
+.tarotBox .gonggao .ul1 li i {
+  font-style: normal;
+  color: #80E6FF;
+}
+.tarotBox .cardBoxText_gift {
+  width: 4.2666666667rem;
+  height: 3.0133333333rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 5.76rem;
+  color: #FEF0C0;
+  font-size: 0.4rem;
+  text-align: center;
+}
+.tarotBox .cardBoxText_gx {
+  width: 4.2666666667rem;
+  height: 3.0133333333rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 5.52rem;
+  box-sizing: border-box;
+  padding-top: 0.88rem;
+  display: none;
+}
+.tarotBox .cardBoxText_gx p {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 0.2133333333rem;
+  color: #FFE26D;
+  font-size: 0.3733333333rem;
+}
+.tarotBox .cardBoxText_gx p i {
+  font-style: normal;
+}
+.tarotBox .cardBoxText_gx p b {
+  color: #FFE26D;
+}
+.tarotBox .cardBoxText_no {
+  width: 4.2666666667rem;
+  height: 3.0133333333rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 5.52rem;
+  box-sizing: border-box;
+  padding-top: 0.88rem;
+  display: none;
+}
+.tarotBox .cardBoxText_no p {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 0.2133333333rem;
+  color: #fff;
+  font-size: 0.3733333333rem;
+}
+.tarotBox .cardBoxText_no p i {
+  font-style: normal;
+}
+.tarotBox .cardBoxText_no p b {
+  color: #80E6FF;
+}
+.tarotBox .cardBoxText {
+  width: 4.2666666667rem;
+  height: 3.0133333333rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 5.52rem;
+  box-sizing: border-box;
+  padding-top: 0.88rem;
+  z-index: 3;
+}
+.tarotBox .cardBoxText p {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 0.2133333333rem;
+  color: #fff;
+  font-size: 0.3733333333rem;
+}
+.tarotBox .cardBoxText p i {
+  font-style: normal;
+}
+.tarotBox .cardBoxText p b {
+  color: #80E6FF;
+}
+.tarotBox .star {
+  width: 4.48rem;
+  height: 3.8666666667rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 5.52rem;
+}
+.tarotBox .star .star_in {
+  width: 100%;
+  height: 100%;
+}
+.tarotBox .star .star_in canvas {
+  width: 100%;
+  height: 100%;
+}
+
+h3 {
+  width: 100%;
+  margin-bottom: 0.16rem;
+  color: #D7D9F7;
+  font-size: 0.24rem;
+  text-align: center;
+}
+
+.rule_pub {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 99999;
+  background: rgba(0, 0, 0, 0.4);
+  display: none;
+}
+.rule_pub .rule_pub_in {
+  width: 8.72rem;
+  height: 11.6533333333rem;
+  background: url(../images/rule.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+.rule_pub .rule_pub_in .close {
+  position: absolute;
+  width: 0.9066666667rem;
+  height: 0.9066666667rem;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: -1.3333333333rem;
+}
+
+.winningRecord {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 99999;
+  background: rgba(0, 0, 0, 0.4);
+  display: none;
+}
+.winningRecord .winningRecord_in {
+  width: 8.72rem;
+  height: 11.6533333333rem;
+  background: url(../images/winningRecord.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+.winningRecord .winningRecord_in .title {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 0.4266666667rem;
+}
+.winningRecord .winningRecord_in .title div {
+  width: 25%;
+  color: #FFFFFF;
+  font-size: 0.3733333333rem;
+  margin-top: 2.1866666667rem;
+  text-align: center;
+}
+.winningRecord .winningRecord_in ul {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 0.04rem;
+  height: 8rem;
+  margin: 0 auto;
+  overflow-y: scroll;
+}
+.winningRecord .winningRecord_in ul::-webkit-scrollbar {
+  width: 0;
+  display: none;
+}
+.winningRecord .winningRecord_in ul li {
+  background: none;
+  width: 100%;
+  height: 1.0666666667rem;
+  line-height: 1.0666666667rem;
+  color: #FFEE9D;
+  font-size: 0.3466666667rem;
+  display: flex;
+  justify-content: space-between;
+  overflow: hidden;
+}
+.winningRecord .winningRecord_in ul li div {
+  text-align: center;
+  width: 25%;
+}
+.winningRecord .winningRecord_in ul li .box {
+  line-height: 1.0666666667rem;
+}
+.winningRecord .winningRecord_in ul li .box_acitve {
+  line-height: 0.45rem;
+  margin-top: 0.1rem;
+}
+.winningRecord .winningRecord_in ul li .time {
+  line-height: 0.4rem;
+  margin-top: 0.2rem;
+}
+.winningRecord .winningRecord_in ul .active {
+  background: rgba(135, 133, 243, 0.6);
+}
+.winningRecord .winningRecord_in .close {
+  position: absolute;
+  width: 0.9066666667rem;
+  height: 0.9066666667rem;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: -1.3333333333rem;
+}
+
+.shade-mask-fragmentNum {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99999;
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.6);
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 8rem;
+  height: 8rem;
+  background: white;
+  border-radius: 0.32rem;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum .fragmentNum-title {
+  font-size: 0.48rem;
+  font-weight: bold;
+  color: #333333;
+  margin-top: 0.5066666667rem;
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum img {
+  width: 1.6rem;
+  width: 1.6rem;
+  margin-top: 1.44rem;
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum p {
+  font-size: 0.4rem;
+  font-weight: 600;
+  color: #333333;
+  margin-top: 0.6666666667rem;
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum .fragmentNum-btn-wrap {
+  display: flex;
+  justify-content: space-between;
+  width: 6.8266666667rem;
+  height: 1.0133333333rem;
+  margin-top: 1.2rem;
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum .fragmentNum-btn-wrap .cancel-btn,
+.shade-mask-fragmentNum .shade-content-fragmentNum .fragmentNum-btn-wrap .confirm-btn {
+  width: 3.2rem;
+  height: 1.0133333333rem;
+  line-height: 1.0133333333rem;
+  text-align: center;
+  border-radius: 0.5066666667rem;
+  font-size: 0.3733333333rem;
+  font-weight: 600;
+  background-color: #EAE5FC;
+  color: #7154EE;
+}
+.shade-mask-fragmentNum .shade-content-fragmentNum .fragmentNum-btn-wrap .confirm-btn {
+  background-color: #735FFE;
+  color: #fff;
+}
+
+/*# sourceMappingURL=index.css.map */

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

@@ -0,0 +1,710 @@
+@function px2rem($px, $rem:75) {
+    @return $px / $rem+rem;
+}
+
+html {}
+
+body {
+    width: 100%;
+    height: px2rem(1624, );
+    background: url(../images/bg.png) no-repeat;
+    background-size: 100% 100%;
+    margin: 0 auto;
+    position: relative;
+    box-sizing: border-box;
+    padding-top: 2.0933333333rem;
+    // overflow-y: scroll;
+}
+
+.back {
+    position: fixed;
+    top: px2rem(70, );
+    left: px2rem(34, );
+    z-index: 9999;
+    width: px2rem(62, );
+    height: px2rem(62, );
+
+    img {
+        width: 100%;
+        height: 100%;
+    }
+
+    p {
+        color: #fff;
+        font-size: px2rem(32, );
+        position: absolute;
+        width: 9rem;
+        left: 0;
+        top: 0;
+        height: 100%;
+        text-align: center;
+        line-height: px2rem(62, );
+    }
+}
+
+.header {
+    width: px2rem(684, );
+    height: px2rem(228, );
+    margin: 0 auto px2rem(0, );
+    display: block;
+    position: relative;
+    z-index: 3;
+}
+
+.roulette {
+    width: px2rem(750, );
+    height: px2rem(850, );
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    top: px2rem(0, );
+
+    .roulette_in {
+        width: 100%;
+        height: 100%;
+
+        canvas {
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+
+.gold_10 {
+    width: px2rem(482, );
+    height: px2rem(52, );
+    margin: px2rem(0, ) auto px2rem(20, );
+    display: block;
+    position: relative;
+    z-index: 3;
+}
+
+.rule {
+    width: px2rem(51, );
+    height: px2rem(140, );
+    background: url(../images/icon.png) no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    top: px2rem(211, );
+    right: 0;
+    color: #FFE7A9;
+    font-size: px2rem(22, );
+    text-align: center;
+    padding: px2rem(25, ) px2rem(10, ) px2rem(23, ) px2rem(20, );
+    box-sizing: border-box;
+    z-index: 3;
+}
+
+.record {
+    width: px2rem(51, );
+    height: px2rem(140, );
+    background: url(../images/icon.png) no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    top: px2rem(364, );
+    right: 0;
+    color: #FFE7A9;
+    font-size: px2rem(22, );
+    text-align: center;
+    padding: px2rem(25, ) px2rem(10, ) px2rem(23, ) px2rem(20, );
+    box-sizing: border-box;
+    z-index: 9;
+}
+
+.tarotBox {
+    width: px2rem(737, );
+    height: px2rem(1060, );
+    background: url(../images/middleBg.png) no-repeat;
+    background-size: 100% 100%;
+    margin: 0 auto 0;
+    position: relative;
+
+    .tabBox {
+        width: px2rem(717, );
+        height: px2rem(98, );
+        display: flex;
+        justify-content: space-between;
+        background: url(../images/tabBox.png) no-repeat;
+        background-size: 100% 100%;
+        margin: 0 auto;
+
+        div {
+            width: px2rem(253, );
+            height: 100%;
+            color: #FEF0C0;
+            font-size: px2rem(28, );
+            text-align: center;
+            box-sizing: border-box;
+            padding-top: px2rem(26, );
+
+            b {
+                color: #FEF0C0;
+                font-size: px2rem(18, );
+                margin-top: px2rem(3, );
+                display: block;
+            }
+        }
+
+        .active1 {
+            background: url(../images/active1.png) no-repeat;
+            background-size: 100% 100%;
+            color: #FFFFFF;
+
+            b {
+                color: #FFFFFF;
+            }
+        }
+
+        .active2 {
+            background: url(../images/active2.png) no-repeat;
+            background-size: 100% 100%;
+            color: #FFFFFF;
+
+            b {
+                color: #FFFFFF;
+            }
+        }
+
+        .active3 {
+            background: url(../images/active3.png) no-repeat;
+            background-size: 100% 100%;
+            color: #FFFFFF;
+
+            b {
+                color: #FFFFFF;
+            }
+        }
+    }
+
+    .gradeText {
+        position: absolute;
+        left: px2rem(74, );
+        top: px2rem(110, );
+        color: #FFEAA9;
+        font-size: px2rem(24, );
+    }
+
+    .diamond {
+        min-width: px2rem(148, );
+        height: px2rem(44, );
+        border-radius: px2rem(44, );
+        line-height: px2rem(44, );
+        position: absolute;
+        right: px2rem(72, );
+        top: px2rem(96, );
+        background: #343662;
+        color: #FFFFFF;
+        border: px2rem(1, ) solid #FFF3B1;
+        box-sizing: border-box;
+        vertical-align: middle;
+
+        .diamondIcon {
+            display: inline-block;
+            width: px2rem(29, );
+            height: px2rem(21, );
+            margin-top: px2rem(12, );
+            margin-left: px2rem(13, );
+        }
+
+        b {
+            font-size: px2rem(20, );
+            display: inline-block;
+            margin: 0 px2rem(7, );
+        }
+
+        .add {
+            width: px2rem(18, );
+            height: px2rem(18, );
+            display: inline-block;
+            margin-top: px2rem(13, );
+            margin-right: px2rem(14, );
+        }
+    }
+
+    .cardBox {
+        width: px2rem(148, );
+        height: px2rem(241, );
+        position: absolute;
+        z-index: 3;
+        // transition: all 1s;
+    }
+
+    .card1 {
+        background: url(../images/card.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+
+    .card2 {
+        background: url(../images/card2.png) no-repeat;
+        background-size: 100% 100%;
+        display: none;
+    }
+
+
+    .card3 {
+        background: url(../images/card3.png) no-repeat;
+        background-size: 100% 100%;
+        display: none;
+    }
+
+    .card1_active {
+        background: url(../images/card1_active.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .card2_active {
+        background: url(../images/card2_active.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .card3_active {
+        background: url(../images/card3_active.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .card_not {
+        background: url(../images/not.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .card_winning1 {
+        background: url(../images/winning1.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .card_winning2 {
+        background: url(../images/winning2.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .card_winning3 {
+        background: url(../images/winning3.png) no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .cardBox0 {
+        left: px2rem(71, );
+        top: px2rem(157, );
+    }
+
+    .cardBox1 {
+        left: px2rem(224, );
+        top: px2rem(157, );
+    }
+
+    .cardBox2 {
+        left: px2rem(378, );
+        top: px2rem(157, );
+    }
+
+    .cardBox3 {
+        left: px2rem(531, );
+        top: px2rem(157, );
+    }
+
+    .cardBox4 {
+        left: px2rem(531, );
+        top: px2rem(414, );
+    }
+
+    .cardBox5 {
+        left: px2rem(531, );
+        top: px2rem(664, );
+    }
+
+    .cardBox6 {
+        left: px2rem(378, );
+        top: px2rem(664, );
+    }
+
+    .cardBox7 {
+        left: px2rem(224, );
+        top: px2rem(664, );
+    }
+
+    .cardBox8 {
+        left: px2rem(71, );
+        top: px2rem(664, );
+    }
+
+    .cardBox9 {
+        left: px2rem(71, );
+        top: px2rem(414, );
+    }
+
+    .cardBoxBut {
+        width: px2rem(188, );
+        height: px2rem(74, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(560, );
+        z-index: 3;
+    }
+
+    .butAgain {
+        width: px2rem(188, );
+        height: px2rem(74, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(560, );
+        display: none;
+        z-index: 3;
+    }
+
+    .gonggao {
+        width: 100%;
+        height: 1.3rem;
+        box-sizing: border-box;
+        position: absolute;
+        left: 0;
+        top: 12.25rem;
+        overflow: hidden;
+
+        .ul1 {
+            width: 100%;
+            height: 100%;
+
+            li {
+                width: 100%;
+                text-align: center;
+                color: #fff;
+                font-size: px2rem(24, );
+                margin-bottom: px2rem(11, );
+
+                b {
+                    color: #FFEAA9;
+                }
+
+                i {
+                    font-style: normal;
+                    color: #80E6FF;
+                }
+            }
+        }
+    }
+
+    .cardBoxText_gift {
+        width: px2rem(320, );
+        height: px2rem(226, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(432, );
+        color: #FEF0C0;
+        font-size: px2rem(30, );
+        text-align: center;
+    }
+
+    .cardBoxText_gx {
+        width: px2rem(320, );
+        height: px2rem(226, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(414, );
+        box-sizing: border-box;
+        padding-top: px2rem(66, );
+        display: none;
+
+        p {
+            width: 100%;
+            text-align: center;
+            margin-bottom: px2rem(16, );
+            color: #FFE26D;
+            font-size: px2rem(28, );
+
+            i {
+                font-style: normal;
+            }
+
+            b {
+                color: #FFE26D;
+            }
+        }
+    }
+
+    .cardBoxText_no {
+        width: px2rem(320, );
+        height: px2rem(226, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(414, );
+        box-sizing: border-box;
+        padding-top: px2rem(66, );
+        display: none;
+
+        p {
+            width: 100%;
+            text-align: center;
+            margin-bottom: px2rem(16, );
+            color: #fff;
+            font-size: px2rem(28, );
+
+            i {
+                font-style: normal;
+            }
+
+            b {
+                color: #80E6FF;
+            }
+        }
+    }
+
+    .cardBoxText {
+        width: px2rem(320, );
+        height: px2rem(226, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(414, );
+        box-sizing: border-box;
+        padding-top: px2rem(66, );
+        z-index: 3;
+
+        p {
+            width: 100%;
+            text-align: center;
+            margin-bottom: px2rem(16, );
+            color: #fff;
+            font-size: px2rem(28, );
+
+            i {
+                font-style: normal;
+            }
+
+            b {
+                color: #80E6FF;
+            }
+        }
+    }
+
+    .star {
+        width: px2rem(336, );
+        height: px2rem(290, );
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(414, );
+
+        .star_in {
+            width: 100%;
+            height: 100%;
+
+            canvas {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+}
+
+h3 {
+    width: 100%;
+    margin-bottom: px2rem(12, );
+    color: #D7D9F7;
+    font-size: px2rem(18, );
+    text-align: center;
+}
+
+.rule_pub {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 99999;
+    background: rgba(0, 0, 0, .4);
+    display: none;
+
+    .rule_pub_in {
+        width: px2rem(654, );
+        height: px2rem(874, );
+        background: url(../images/rule.png) no-repeat;
+        background-size: 100% 100%;
+        position: relative;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+
+        .close {
+            position: absolute;
+            width: px2rem(68, );
+            height: px2rem(68, );
+            left: 50%;
+            transform: translateX(-50%);
+            bottom: px2rem(-100, );
+        }
+    }
+}
+
+.winningRecord {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 99999;
+    background: rgba(0, 0, 0, .4);
+    display: none;
+
+    .winningRecord_in {
+        width: px2rem(654, );
+        height: px2rem(874, );
+        background: url(../images/winningRecord.png) no-repeat;
+        background-size: 100% 100%;
+        position: relative;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+
+        .title {
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: px2rem(32, );
+
+            div {
+                width: 25%;
+                color: #FFFFFF;
+                font-size: px2rem(28, );
+                margin-top: px2rem(164, );
+                text-align: center;
+            }
+        }
+
+        ul {
+            width: 100%;
+            box-sizing: border-box;
+            padding: 0 px2rem(3, );
+            height: 8rem;
+            margin: 0 auto;
+            overflow-y: scroll;
+
+            &::-webkit-scrollbar {
+                width: 0;
+                display: none;
+            }
+
+            li {
+                background: none;
+                width: 100%;
+                height: px2rem(80, );
+                line-height: px2rem(80, );
+                color: #FFEE9D;
+                font-size: px2rem(26, );
+                display: flex;
+                justify-content: space-between;
+                overflow: hidden;
+
+                div {
+                    text-align: center;
+                    width: 25%;
+                }
+
+                .box {
+                    line-height: px2rem(80, );
+                }
+
+                .box_acitve {
+                    line-height: 0.45rem;
+                    margin-top: 0.1rem;
+                }
+
+                .time {
+                    line-height: 0.4rem;
+                    margin-top: 0.2rem;
+                }
+            }
+
+            .active {
+                background: rgba(135, 133, 243, 0.6);
+            }
+        }
+
+        .close {
+            position: absolute;
+            width: px2rem(68, );
+            height: px2rem(68, );
+            left: 50%;
+            transform: translateX(-50%);
+            bottom: px2rem(-100, );
+        }
+    }
+}
+
+// 碎片不足弹窗
+.shade-mask-fragmentNum {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 99999;
+    width: 100vw;
+    height: 100vh;
+    background-color: rgba($color: #000000, $alpha: 0.6);
+
+    .shade-content-fragmentNum {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        width: px2rem(600);
+        height: px2rem(600);
+        background: white;
+        border-radius: px2rem(24);
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .fragmentNum-title {
+            font-size: px2rem(36);
+            font-weight: bold;
+            color: #333333;
+            margin-top: px2rem(38);
+        }
+
+        img {
+            width: px2rem(120);
+            width: px2rem(120);
+            margin-top: px2rem(108);
+        }
+
+        p {
+            font-size: px2rem(30);
+            font-weight: 600;
+            color: #333333;
+            margin-top: px2rem(50);
+        }
+
+        .fragmentNum-btn-wrap {
+            display: flex;
+            justify-content: space-between;
+            width: px2rem(512);
+            height: px2rem(76);
+            margin-top: px2rem(90);
+
+            .cancel-btn,
+            .confirm-btn {
+                width: px2rem(240);
+                height: px2rem(76);
+                line-height: px2rem(76);
+                text-align: center;
+                border-radius: px2rem(38);
+                font-size: px2rem(28);
+                font-weight: 600;
+                background-color: #EAE5FC;
+                color: #7154EE;
+            }
+
+            .confirm-btn {
+                background-color: #735FFE;
+                color: #fff;
+            }
+        }
+    }
+}

view/peko/modules/luckyTarot/index.html

@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>幸運塔羅</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/index.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back.png" alt="">
+        <!-- <p>幸運塔羅</p> -->
+    </div>
+    <!-- 主視覺 -->
+    <img src="./images/header.png" alt="" class="header">
+    <!-- 轮盘动效 -->
+    <div class="roulette">
+        <div class="roulette_in"></div>
+    </div>
+    <!-- 十倍鉆石 -->
+    <img src="./images/10Gold.png" alt="" class="gold_10">
+    <!-- 玩法介紹 -->
+    <div class="rule">玩法介紹</div>
+    <!-- 中獎記錄 -->
+    <div class="record">中獎記錄</div>
+    <!-- 塔羅大背景 -->
+    <div class="tarotBox">
+        <!-- 選擇等級tab -->
+        <div class="tabBox">
+            <div class="active1 tabBox1">初級卡<br><b>100鉆/張</b></div>
+            <div class="tabBox2">中級卡<br><b>1000鉆/張</b></div>
+            <div class="tabBox3">高級卡<br><b>10000鉆/張</b></div>
+        </div>
+        <!-- 等級介紹 -->
+        <p class="gradeText">翻到鉆石卡獲得<b>1000</b>鉆石</p>
+        <!-- 剩余鉆石 -->
+        <div class="diamond">
+            <img src="./images/diamond.png" alt="" class="diamondIcon">
+            <b>0</b>
+            <img src="./images/add.png" alt="" class="add">
+        </div>
+        <!-- 默認卡片 -->
+        <div class="cardBox cardBox0 card1"></div>
+        <div class="cardBox cardBox1 card1"></div>
+        <div class="cardBox cardBox2 card1"></div>
+        <div class="cardBox cardBox3 card1"></div>
+        <div class="cardBox cardBox4 card1"></div>
+        <div class="cardBox cardBox5 card1"></div>
+        <div class="cardBox cardBox6 card1"></div>
+        <div class="cardBox cardBox7 card1"></div>
+        <div class="cardBox cardBox8 card1"></div>
+        <div class="cardBox cardBox9 card1"></div>
+        <!-- 中級卡片 -->
+        <div class="cardBox cardBox0 card2"></div>
+        <div class="cardBox cardBox1 card2"></div>
+        <div class="cardBox cardBox2 card2"></div>
+        <div class="cardBox cardBox3 card2"></div>
+        <div class="cardBox cardBox4 card2"></div>
+        <div class="cardBox cardBox5 card2"></div>
+        <div class="cardBox cardBox6 card2"></div>
+        <div class="cardBox cardBox7 card2"></div>
+        <div class="cardBox cardBox8 card2"></div>
+        <div class="cardBox cardBox9 card2"></div>
+        <!-- 高級卡片 -->
+        <div class="cardBox cardBox0 card3"></div>
+        <div class="cardBox cardBox1 card3"></div>
+        <div class="cardBox cardBox2 card3"></div>
+        <div class="cardBox cardBox3 card3"></div>
+        <div class="cardBox cardBox4 card3"></div>
+        <div class="cardBox cardBox5 card3"></div>
+        <div class="cardBox cardBox6 card3"></div>
+        <div class="cardBox cardBox7 card3"></div>
+        <div class="cardBox cardBox8 card3"></div>
+        <div class="cardBox cardBox9 card3"></div>
+        <!-- 女神眷顧妳 -->
+        <div class="cardBoxText_gift">願幸運之神眷顧妳</div>
+        <!-- 中獎文按提示 -->
+        <div class="cardBoxText_gx">
+            <p>翻到鉆石卡!</p>
+            <p>獲得 <b>0</b> 鉆石</p>
+        </div>
+        <!-- 選擇文按提示 -->
+        <div class="cardBoxText">
+            <p>共選擇 <b>0</b> 張</p>
+            <p>獲得<i>0</i>鉆石的概率為<b>0%</b></p>
+        </div>
+        <!-- 星星动效 -->
+        <div class="star">
+            <div class="star_in"></div>
+        </div>
+        <!-- 沒中文案提示 -->
+        <div class="cardBoxText_no">
+            <p>差一點就成功了</p>
+            <p>別灰心</p>
+        </div>
+        <!-- 翻拍按鈕 -->
+        <img src="./images/but1.png" alt="" class="cardBoxBut">
+        <!-- 再翻一次按鈕 -->
+        <img src="./images/butAgain1.png" alt="" class="butAgain">
+        <!-- 公告 -->
+        <div class="gonggao">
+            <ul class="ul1">
+                <!-- <li>恭喜 <b>111誰誰誰誰誰...</b>翻開 <b>初級卡</b> 獲得 <i>1000鉆石</i></li>
+                <li>恭喜 <b>222誰誰誰誰誰...</b>翻開 <b>初級卡</b> 獲得 <i>1000鉆石</i></li>
+                <li>恭喜 <b>333誰誰誰誰誰...</b>翻開 <b>初級卡</b> 獲得 <i>1000鉆石</i></li>
+                <li>恭喜 <b>444誰誰誰誰誰...</b>翻開 <b>初級卡</b> 獲得 <i>1000鉆石</i></li> -->
+            </ul>
+        </div>
+    </div>
+    <!-- 本活動最終解釋權歸所有&本活動以及活動獎勵與蘋果公司無關 -->
+    <h3>本活動最終解釋權歸Peko所有</h3>
+    <h3>本活動以及活動獎勵與Google/蘋果公司無關</h3>
+    <!-- 活動規則彈窗 -->
+    <div class="rule_pub">
+        <div class="rule_pub_in">
+            <img src="./images/close.png" alt="" class="close">
+        </div>
+    </div>
+    <div class="winningRecord">
+        <div class="winningRecord_in">
+            <div class="title">
+                <div>等級</div>
+                <div>選擇卡牌</div>
+                <div>中獎情況</div>
+                <div>時間</div>
+            </div>
+            <ul>
+                <!-- <li>
+                    <div>初級卡</div>
+                    <div>X張</div>
+                    <div class="box">未中獎</div>
+                    <div class="time">2021.05.14<br>15:00:00</div>
+                </li>
+                <li>
+                    <div>初級卡</div>
+                    <div>X張</div>
+                    <div class="box_acitve">中獎<br>1000000鉆石</div>
+                    <div class="time">2021.05.14<br>15:00:00</div>
+                </li> -->
+            </ul>
+            <img src="./images/close.png" alt="" class="close">
+        </div>
+    </div>
+    <!-- 余額不足提示彈窗 -->
+    <div class="shade-mask-fragmentNum">
+        <div class="shade-content-fragmentNum">
+            <div class="fragmentNum-title">鉆石余額不足</div>
+            <img src="./images/no-money.png" alt="">
+            <p>當前鉆石不足</p>
+            <div class="fragmentNum-btn-wrap">
+                <div class="cancel-btn">取消</div>
+                <div class="confirm-btn">獲取鉆石</div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/svga.min.js"></script>
+<script src="./js/index.js"></script>

view/peko/modules/luckyTarot/js/index.js

@@ -0,0 +1,530 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+if (env == 'test') {
+    new VConsole();
+}
+// 封裝layer消息提醒框
+let layerIndex
+const showLoading = (content = '加載中...') => {
+    layer.open({
+        type: 2,
+        shadeClose: false,
+        content,
+        success (e) {
+            layerIndex = $(e).attr('index')
+        }
+    })
+}
+const hideLoading = (index) => {
+    layer.close(index)
+}
+const toastMsg = (content = '操作完成', time = 2) => {
+    layer.open({
+        content,
+        time,
+        skin: 'msg'
+    })
+}
+var cardArr = [];//記錄選擇卡片
+var gearPosition = []//檔位價值的鉆石
+var gearPositionActive = 0;//當前選澤的檔位
+var prodId = [];//檔位類型
+var prodIdActive;
+var lock = true;//鎖
+var page = 1;//頁碼
+var scrollLock = true;
+var arrLast = []//記錄上次開獎的數組
+// 初始化函數
+$(function () {
+    setTimeout(function () {
+        getInfoFromClient()
+        setTimeout(function () {
+            // 頁面全屏
+            if (browser.app) {
+                if (browser.android) {
+                    window.androidJsObj.initShowNav(false)
+                } else {
+                    window.webkit.messageHandlers.initShowNav.postMessage(0)
+                }
+            };
+            // 頂部返回事件
+            $('.back').click(() => {
+                if (browser.android) {
+                    window.androidJsObj.closeWebView()
+                } else {
+                    window.webkit.messageHandlers.closeWebView.postMessage(null)
+                }
+            })
+            getAdvertising();
+            productList();
+            getUserInfo();
+            svgaFun();
+            svgaFun2();
+        }, 100)
+    })
+})
+// 播放svg
+function svgaFun () {
+    player1 = new SVGA.Player('.star_in');
+    parser1 = new SVGA.Parser('.star_in');
+    parser1.load('./images/star.svga', function (videoItem) {
+        // player1.loops= 1
+        // player1.clearsAfterStop = false;
+        // player1.setVideoItem(videoItem);
+        // player1.startAnimation();
+        // player1.loops = 1;
+        player1.clearsAfterStop = false;
+        player1.setVideoItem(videoItem);
+        player1.startAnimation();
+        player1.setContentMode('AspectFill')
+        player1.onFinished(() => {
+            // $('.svga').hide()
+        })
+    })
+}
+// 播放svg
+function svgaFun2 () {
+    player2 = new SVGA.Player('.roulette_in');
+    parser2 = new SVGA.Parser('.roulette_in');
+    parser2.load('./images/roulette.svga', function (videoItem) {
+        // player1.loops= 1
+        // player1.clearsAfterStop = false;
+        // player1.setVideoItem(videoItem);
+        // player1.startAnimation();
+        // player1.loops = 1;
+        player2.clearsAfterStop = false;
+        player2.setVideoItem(videoItem);
+        player2.startAnimation();
+        player2.setContentMode('AspectFill')
+        player2.onFinished(() => {
+            // $('.svga').hide()
+        })
+    })
+}
+// 公告接口 
+function getAdvertising () {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/seekElfin/draw/list',
+        data: {
+            count: 30
+        },
+        success (res) {
+            if (res.code === 200) {
+                let result = ''
+                res.data.forEach(res => {
+                    result += `
+                      <li>恭喜 <b>${res.nick.length > 5 ? res.nick.slice(0, 5) + '...' : res.nick}</b>翻開 <b>幸運塔羅</b> 獲得 <i>${res.receiveGoldNum}鉆石</i></li>
+                    `
+                })
+                $('.ul1').append(result)
+                var num = $(".ul1").find("li").length;
+                if (num > 1) {
+                    setInterval(function () {
+                        $('.ul1').animate({
+                            marginTop: "-0.4rem"
+                        }, 200, function () {
+                            $(this).css({
+                                marginTop: "0"
+                            }).find("li:first").appendTo(this);
+                        });
+                    }, 2000);
+                }
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 檔位接口 
+function productList () {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/seekElfin/product/list',
+        data: {
+            uid: pubInfo.uid
+        },
+        success (res) {
+            if (res.code === 200) {
+                gearPositionActive = res.data[0].prodNeedPrice;
+                prodIdActive = res.data[0].prodId;
+                res.data.forEach((res, i) => {
+                    gearPosition.push(res.prodNeedPrice);
+                    prodId.push(res.prodId);
+                    $(`.tarotBox .tabBox .tabBox${i + 1} b`).text(`${res.prodNeedPrice}鉆/張`)
+                })
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 獲取用戶信息
+const getUserInfo = () => {
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/seekElfin/user/info',
+        data: {
+            uid: pubInfo.uid
+        },
+        success: function (res) {
+            if (res.code == 200) {
+                $('.tarotBox .diamond b').text(res.data.diamonds);
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex)
+        },
+        error: function (res) {
+            hideLoading(layerIndex)
+            console.log(res, '報錯啦');
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 抽獎記錄
+const recordPage = () => {
+    showLoading()
+    networkRequest({
+        type: 'GET',
+        url: urlPrefix + '/seekElfin/record/page',
+        data: {
+            uid: pubInfo.uid,
+            current: page,
+            size: 10,
+        },
+        success: function (res) {
+            if (res.code == 200) {
+                var str = ''
+                res.data.records.forEach((res, i) => {
+                    str += `
+                        <li calss="${i % 2 == 0 ? 'active' : ''}">
+                            <div>${res.prodName}</div>
+                            <div>${JSON.parse(res.selectdNo).length}張</div>
+                            <div class="box ${res.win ? 'box_acitve' : ''}">${res.win ? `中獎<br>${res.receiveGoldNum}鉆石` : '未中獎'}</div>
+                            <div class="time">${dateFormat(res.createTime, 'yyyy.MM.dd')}<br>${dateFormat(res.createTime, 'hh:mm:ss')}</div>
+                        </li>
+                    `
+                });
+                $('.winningRecord .winningRecord_in ul').append(str);
+                if (res.data.records.length == 0) {
+                    scrollLock = false;
+                } else {
+                    scrollLock = true;
+                }
+            } else {
+                scrollLock = true;
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex)
+        },
+        error: function (res) {
+            scrollLock = true;
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 抽獎接口
+const draw = () => {
+    lock = false;
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/seekElfin/draw',
+        data: JSON.stringify({
+            prodId: prodIdActive,
+            selectedNo: cardArr,
+            roomUid: pubInfo.roomUid,
+            // roomUid: pubInfo.uid,
+        }),
+        headers: { 'Content-Type': 'application/json;charset=utf8' },
+        success: function (res) {
+            if (res.code == 200) {
+                kineticEffect(cardArr, res.data.win, res);
+                getUserInfo();
+            }
+            else if (res.code == 2103) {
+                lock = true;
+                $('.shade-mask-fragmentNum').show();
+                bodyScroolFun(true);
+                // toastMsg(res.message);
+            } else {
+                lock = true;
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex)
+        },
+        error: function (res) {
+            lock = true;
+            hideLoading(layerIndex)
+            console.log(res, '報錯啦');
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 恢復初始樣式函數
+function initialStytle (bool) {
+    if (bool) {
+        // arrLast = [0, 1, 2];
+        arrLast.forEach((res, i) => {
+            $(`.tarotBox .cardBox${res}`).css({
+                transition: ' all 1s',
+                transform: 'rotateY(-360deg)',
+            })
+        })
+        setTimeout(function () {
+            $('.tarotBox .cardBox').css({
+                transition: ' all 0s',
+                transform: 'rotateY(0deg)',
+            });
+        }, 1000)
+    }
+    lock = true;
+    // 清空已選卡片
+    cardArr = [];
+    // 恢復卡片默認樣式
+    $('.tarotBox .cardBox').removeClass('card1_active');
+    $('.tarotBox .cardBox').removeClass('card2_active');
+    $('.tarotBox .cardBox').removeClass('card3_active');
+
+    // 恢復默認選擇文案
+    $('.tarotBox .cardBoxText').html(`
+        <p>共選擇 <b>${cardArr.length}</b> 張</p>
+        <p>翻到鉆石卡的概率為<b>${cardArr.length * 10}%</b></p>
+    `);
+    // 清除中獎&未中獎樣式
+    $('.tarotBox .cardBox').removeClass('card_not');
+    $('.tarotBox .cardBox').removeClass('card_winning1');
+    $('.tarotBox .cardBox').removeClass('card_winning2');
+    $('.tarotBox .cardBox').removeClass('card_winning3');
+    $('.tarotBox .cardBoxText_no').hide();
+    $('.tarotBox .cardBoxText_gx').hide()
+    $('.tarotBox .cardBoxText').show();
+    $('.tarotBox .cardBoxText_gift').show();
+    $('.cardBoxBut').show();
+    $('.butAgain').hide();
+}
+// 處理動效
+function kineticEffect (arr, bool, data) {
+    arrLast = arr;
+    arr.forEach((res, i) => {
+        $(`.tarotBox .cardBox${res}`).css({
+            transition: ' all 1s',
+            transform: 'rotateY(360deg)',
+        })
+    })
+
+    setTimeout(function () {
+        $('.tarotBox .cardBox').css({
+            transition: ' all 0s',
+            transform: 'rotateY(0deg)',
+        });
+        arr.forEach((res, i) => {
+            $(`.tarotBox .cardBox${res}`).addClass('card_not');
+        })
+        if (bool) {
+            //中獎
+            $(`.tarotBox .cardBox${data.data.drawNum}`).addClass(prodIdActive == 1 ? 'card_winning1' : prodIdActive == 2 ? 'card_winning2' : 'card_winning3')
+            $('.tarotBox .cardBoxText').hide();
+            $('.tarotBox .cardBoxText_gift').hide();
+            $('.cardBoxText_gx').html(`
+                <p>翻到鉆石卡!</p>
+                <p>獲得 <b>${data.data.receiveGoldNum}</b> 鉆石</p>
+            `)
+            $('.cardBoxText_gx').show();
+        } else {
+            //未中獎
+            $('.tarotBox .cardBoxText').hide();
+            $('.tarotBox .cardBoxText_gift').hide();
+            $('.tarotBox .cardBoxText_no').show();
+        }
+        $('.cardBoxBut').hide();
+        $('.tarotBox .butAgain').attr('src', prodIdActive == 1 ? './images/butAgain1.png' : prodIdActive == 2 ? './images/butAgain2.png' : './images/butAgain3.png')
+        $('.butAgain').show();
+    }, 1000)
+}
+// 檔位tab切換按鈕
+$('.tarotBox .tabBox div').click(function () {
+    var i = $(this).index() + 1;
+    // 切換tab樣式
+    $('.tarotBox .tabBox div').removeClass('active1').removeClass('active2').removeClass('active3');
+    $(this).addClass(`active${i}`);
+    // 切換卡牌樣式
+    $('.tarotBox .cardBox').hide();
+    $(`.tarotBox .card${i}`).show();
+    // 切換按鈕樣式
+    $('.tarotBox .cardBoxBut').attr('src', `./images/but${i}.png`)
+    // if (i == 1) {
+    gearPositionActive = gearPosition[i - 1];
+    prodIdActive = prodId[i - 1];
+    $('.tarotBox .gradeText b').text(gearPositionActive * 10);
+    // } else if (i == 2) {
+    //     gearPosition = 1000;
+    //     $('.tarotBox .gradeText b').text(gearPosition * 10);
+    // } else {
+    //     gearPosition = 10000;
+    //     $('.tarotBox .gradeText b').text(gearPosition * 10);
+    // }
+    // 清空默認樣式
+    initialStytle();
+})
+// 選擇初級卡片按鈕
+$('.tarotBox .card1').click(function () {
+    var i = $(this).index();
+    tarotBox($(this), i, 1);
+})
+// 選擇中級卡片按鈕
+$('.tarotBox .card2').click(function () {
+    var i = $(this).index();
+    tarotBox($(this), i, 2);
+})
+// 選擇高級卡片按鈕
+$('.tarotBox .card3').click(function () {
+    var i = $(this).index();
+    tarotBox($(this), i, 3);
+})
+// 選擇卡片樣式
+function tarotBox (dom, i, type) {
+    if (lock) {
+        var i = type == 1 ? dom.index() - 3 : type == 2 ? dom.index() - 13 : dom.index() - 23;
+        if (cardArr.indexOf(i) == -1) {
+            if (cardArr.length < 9) {
+                dom.addClass(type == 1 ? 'card1_active' : type == 2 ? 'card2_active' : 'card3_active');
+                cardArr.push(i);
+            } else {
+                toastMsg('最多只能選擇9張');
+            }
+        } else {
+            dom.removeClass(type == 1 ? 'card1_active' : type == 2 ? 'card2_active' : 'card3_active');
+            cardArr.splice(cardArr.indexOf(i), 1);
+        }
+        $('.tarotBox .cardBoxText').html(`
+        <p>共選擇 <b>${cardArr.length}</b> 張</p>
+        <p>翻到鉆石卡的概率為<b>${cardArr.length * 10}%</b></p>
+    `);
+        console.log(cardArr);
+    }
+}
+// 翻牌按鈕
+$('.tarotBox .cardBoxBut').click(function () {
+    if (cardArr.length == 0) {
+        toastMsg('請先選擇卡片');
+        return;
+    }
+    if (lock) {
+        draw();
+    }
+})
+// 再翻一次按鈕
+$('.butAgain').click(function () {
+    initialStytle(true);
+})
+// 跳轉充值頁面
+$('.tarotBox .diamond').click(() => {
+    if (browser.app) {
+        if (browser.android) {
+            let channel = pubInfo.deviceInfo.channel;
+            console.log(pubInfo.deviceInfo);
+            if (channel == "google") {
+                window.androidJsObj.openChargePage(6);
+            } else {
+                window.androidJsObj.openChargePage(6);
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            }
+        } else if (browser.ios) {
+            let channel = pubInfo.deviceInfo.channel;
+            if (channel == "appstore") {
+                window.webkit.messageHandlers.openChargePage.postMessage(null);
+            } else {
+                window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            }
+        }
+    } else {
+        toastMsg('請在app內打開')
+    }
+})
+// 打開規則
+$('.rule').click(function () {
+    bodyScroolFun(true);
+    $('.rule_pub ').show();
+})
+// 關閉規則
+$('.rule_pub .rule_pub_in .close').click(function () {
+    bodyScroolFun(false);
+    $('.rule_pub ').hide();
+})
+// 打開記錄
+$('.record').click(function () {
+    $('.winningRecord .winningRecord_in ul li').remove();
+    page = 1;
+    recordPage();
+    bodyScroolFun(true);
+    $('.winningRecord ').show();
+})
+// 關閉記錄
+$('.winningRecord .winningRecord_in .close').click(function () {
+    bodyScroolFun(false);
+    $('.winningRecord ').hide();
+})
+// 記錄監聽滾動
+$('.winningRecord .winningRecord_in ul').scroll(function () {
+    let scrollTop = $(this).scrollTop()
+    let scrollHeight = $('.winningRecord .winningRecord_in ul')[0].scrollHeight
+    let ulHeight = $(this).innerHeight()
+    if (scrollTop + ulHeight + 10 >= scrollHeight) {
+        if (scrollLock) {
+            scrollLock = false;
+            page++;
+            recordPage();
+            console.log('到底了');
+        }
+    }
+})
+// 關閉去充值彈窗
+$('.shade-mask-fragmentNum .cancel-btn').click(function () {
+    $('.shade-mask-fragmentNum').hide();
+    bodyScroolFun(false);
+})
+// 確認去充值彈窗
+$('.shade-mask-fragmentNum .confirm-btn').click(function () {
+    $('.shade-mask-fragmentNum').hide();
+    bodyScroolFun(false);
+    if (browser.app) {
+        if (browser.android) {
+            let channel = pubInfo.deviceInfo.channel;
+            console.log(pubInfo.deviceInfo);
+            if (channel == "google") {
+                window.androidJsObj.openChargePage(6);
+            } else {
+                window.androidJsObj.openChargePage(6);
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            }
+        } else if (browser.ios) {
+            let channel = pubInfo.deviceInfo.channel;
+            if (channel == "appstore") {
+                window.webkit.messageHandlers.openChargePage.postMessage(null);
+            } else {
+                window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
+                window.location.href = urlPrefix + '/peko/modules/pay/index.html?channelType=4';
+            }
+        }
+    } else {
+        toastMsg('請在app內打開')
+    }
+})

view/peko/modules/myincome/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>peko</title><link href=./static/css/app.763acf482fd949aa2b6aca35e66cd48a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ff1ddeb298b66452540.js></script><script type=text/javascript src=./static/js/vendor.e1f3b20580f807878b61.js></script><script type=text/javascript src=./static/js/app.94ae80952039b32488f3.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>peko</title><link href=./static/css/app.9024cf5b5b638d6196f8d6723d6c3288.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.eb68c1619df0aa11f84e.js></script><script type=text/javascript src=./static/js/vendor.e1f3b20580f807878b61.js></script><script type=text/javascript src=./static/js/app.94ae80952039b32488f3.js></script></body></html>

view/peko/modules/myincome/static/js/manifest.eb68c1619df0aa11f84e.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"1b5c2ea8472946953399",1:"65c8a24141285f752017",2:"a2b32e8c55ba73112c78",3:"9fd973fc82b8572762de",4:"767ba8e6439ee368e707",5:"cfbd71b488f0ae20c621",6:"83f6e0e15e71cd5ff43a",7:"c4fa50566fd7f80d2aaa",8:"75bdd56bd8357a66d24a",9:"d02156509389fc441584",10:"7701ab9520657412738d",11:"5d316356ba01de644f13",12:"3863edf6c1e9613ef3b0"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"1b5c2ea8472946953399",1:"65c8a24141285f752017",2:"a2b32e8c55ba73112c78",3:"ed406b8ec0fd2ce7d3e3",4:"767ba8e6439ee368e707",5:"cfbd71b488f0ae20c621",6:"83f6e0e15e71cd5ff43a",7:"c4fa50566fd7f80d2aaa",8:"75bdd56bd8357a66d24a",9:"d02156509389fc441584",10:"7701ab9520657412738d",11:"5d316356ba01de644f13",12:"9fa60d0ceeb3ed4adc40"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.3ff1ddeb298b66452540.js.map
+//# sourceMappingURL=manifest.eb68c1619df0aa11f84e.js.map

view/peko/modules/pay/index.html

@@ -94,7 +94,7 @@
     <script src="../../common/js/pingpp.js"></script>
     <script src="../../common/js/common2.js?v=8.0"></script>
     <script src="../../common/js/layer.js"></script>
-    <script src="./js/index.js?v=1.2"></script>
+    <script src="./js/index.js?v=1.3"></script>
 </body>
 
 </html>

view/peko/modules/pay/js/index.js

@@ -8,7 +8,7 @@ let arr2 = [];
 let countryCode = "";//选择区号
 var channelType;//参数值4：鉆石充值 || 参数值5：贵族vip充值 || 6：首充充值
 let erbanNo;//账号
-let chargeProdId;//金额:tw_payermax_1003_1000
+let chargeProdId = '';//金额:tw_payermax_1003_1000
 let openId;
 let payChannel;//付款方式
 let paymentType;//付款码
@@ -111,6 +111,7 @@ $(function () {
                         paymentType = $(this).attr('paymentType');
                         payChannel = $(this).attr('payChannel');
                         // $(this).parent().addClass('active').siblings().removeClass('active');
+                        chargeProdId = '';
                         $('.methods span').removeClass('active');
                         $(this).addClass('active');
                         coloursFun($(this).attr('index'), $(this).attr('type'));
@@ -121,7 +122,7 @@ $(function () {
                         console.log(countryCode)
                         if (modeOfPayment == false) {
                             logingFun("請選擇儲值方式")//''
-                        } else if (paymentAmount == false) {
+                        } else if (paymentAmount == false || chargeProdId == '') {
                             logingFun("請選擇您的儲值金額")//'' 
                         } else {
                             console.log(countryCode)
@@ -208,10 +209,10 @@ $(function () {
         $('.pop_up').show();
     });
 
-    $('.pop_up').click(function(){
+    $('.pop_up').click(function () {
         $('.pop_up').hide();
     })
-    
+
     function coloursFun (index, type) {
         $('.pay_number .number span').remove();
         var str = '';

view/peko/modules/rank/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>peko</title><link href=./static/css/app.ad77ac0b1e4081a4b070dd81d143c87d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.c428366cb79b51980868.js></script><script type=text/javascript src=./static/js/vendor.bd9f10b71d94e5f4d6dc.js></script><script type=text/javascript src=./static/js/app.f00a0f7eabbb2e2190d0.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>peko</title><link href=./static/css/app.9f6e4f78dfc7ba94683db803f7547b35.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d116e345638fd92d6554.js></script><script type=text/javascript src=./static/js/vendor.bd9f10b71d94e5f4d6dc.js></script><script type=text/javascript src=./static/js/app.f00a0f7eabbb2e2190d0.js></script></body></html>

view/peko/modules/rank/static/js/manifest.d116e345638fd92d6554.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={9:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"53a3f98235aff13506fa",1:"1bd9d8db377a897451e8",2:"6465ab618ceaa0da86d8",3:"7a4dfeb0d7ea325598f5",4:"8390f052d8348429fb11",5:"36de0cf38e7936e529ee",6:"b3d9ff408c7d4d4b55df"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,f){for(var c,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(c in a)Object.prototype.hasOwnProperty.call(a,c)&&(e[c]=a[c]);for(n&&n(r,a,f);s.length;)s.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[d]);return u};var r={},t={9:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"53a3f98235aff13506fa",1:"1bd9d8db377a897451e8",2:"22edda0f675d5b7f4423",3:"7a4dfeb0d7ea325598f5",4:"8390f052d8348429fb11",5:"36de0cf38e7936e529ee",6:"b3d9ff408c7d4d4b55df"}[e]+".js";var c=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(c);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,a.appendChild(f),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.c428366cb79b51980868.js.map
+//# sourceMappingURL=manifest.d116e345638fd92d6554.js.map

view/peko/modules/statistic/css/login.css

@@ -0,0 +1,214 @@
+html,
+body {
+  width: 100%;
+}
+
+.back {
+  position: fixed;
+  z-index: 9;
+  width: 0.7466666667rem;
+  height: 0.7466666667rem;
+  left: 0.5333333333rem;
+  top: 0.6666666667rem;
+  display: none;
+}
+
+.header {
+  width: 100%;
+  height: 8.88rem;
+  background: url(../images/login/bg.png) no-repeat;
+  background-size: 100% 100%;
+  position: relative;
+  margin: 0 auto -2rem;
+}
+.header .logo {
+  position: absolute;
+  width: 5.7066666667rem;
+  height: 5.7066666667rem;
+  left: 50%;
+  top: 2.4266666667rem;
+  transform: translateX(-50%);
+}
+
+.box {
+  width: 10rem;
+  height: 14.6133333333rem;
+  border-radius: 0.6666666667rem 0.6666666667rem 0px 0px;
+  margin: 0 auto;
+  position: relative;
+  z-index: 2;
+  background: #fff;
+  overflow: hidden;
+}
+.box input {
+  background: transparent;
+  border: none;
+  outline: none;
+  box-sizing: border-box;
+  padding: 0 0.64rem;
+}
+.box input::placeholder {
+  font-size: 0.3733333333rem;
+  color: #8A8CAB;
+}
+.box .idLogin .id {
+  width: 8.08rem;
+  height: 1.3866666667rem;
+  background: #F3F5FA;
+  border-radius: 1.3866666667rem;
+  margin: 1.28rem auto 0.5333333333rem;
+  display: block;
+}
+.box .idLogin .password {
+  width: 8.08rem;
+  height: 1.3866666667rem;
+  background: #F3F5FA;
+  border-radius: 1.3866666667rem;
+  margin: 0rem auto 1.0666666667rem;
+  display: block;
+}
+.box .phone {
+  display: none;
+}
+.box .phone .phoneNumberBox {
+  width: 8.08rem;
+  height: 1.3866666667rem;
+  background: #F3F5FA;
+  border-radius: 1.3866666667rem;
+  margin: 1.28rem auto 0.5333333333rem;
+  box-sizing: border-box;
+  padding-left: 0.64rem;
+}
+.box .phone .phoneNumberBox .prefix {
+  float: left;
+  font-size: 0.4266666667rem;
+  color: #1F1B4F;
+  font-weight: bold;
+  height: 100%;
+  line-height: 1.3866666667rem;
+}
+.box .phone .phoneNumberBox .prefix b {
+  font-size: 0.4266666667rem;
+  color: #1F1B4F;
+  font-weight: bold;
+  margin-right: 0.1066666667rem;
+}
+.box .phone .phoneNumberBox .prefix img {
+  display: inline-block;
+  width: 0.32rem;
+  height: 0.2133333333rem;
+  vertical-align: middle;
+}
+.box .phone .phoneNumberBox .phoneNumber {
+  float: right;
+  height: 100%;
+  padding: 0;
+  width: 5.5rem;
+}
+.box .phone .codeBox {
+  width: 8.08rem;
+  height: 1.3866666667rem;
+  background: #F3F5FA;
+  border-radius: 1.3866666667rem;
+  margin: 0rem auto 1.0666666667rem;
+}
+.box .phone .codeBox .code {
+  float: left;
+  width: 5rem;
+  height: 100%;
+}
+.box .phone .codeBox .codeBut {
+  text-align: center;
+  color: #FFFFFF;
+  font-size: 0.3733333333rem;
+  border-radius: 1.0133333333rem;
+  width: 2.72rem;
+  height: 1.0133333333rem;
+  line-height: 1.0133333333rem;
+  float: right;
+  margin-top: 0.1866666667rem;
+  margin-right: 0.2133333333rem;
+  background: #9168FA;
+}
+.box .phone .codeBox .codeButTime {
+  background: #DED1FD;
+}
+.box .but {
+  width: 8.08rem;
+  height: 1.28rem;
+  border-radius: 1.28rem;
+  line-height: 1.28rem;
+  text-align: center;
+  color: #FFFFFF;
+  font-size: 0.4266666667rem;
+  margin: 0 auto 0.5333333333rem;
+  background: linear-gradient(90deg, #EEDCFF 0%, #DEE4FF 50%, #CCF8F9 100%);
+}
+.box .butok {
+  background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
+}
+.box .hone {
+  width: 8.08rem;
+  height: 1.28rem;
+  border-radius: 1.28rem;
+  line-height: 1.28rem;
+  text-align: center;
+  color: #9168FA;
+  font-size: 0.4266666667rem;
+  margin: 0 auto 0.5333333333rem;
+  background: linear-gradient(270deg, #FAEDFF 0%, #E6FDFF 100%);
+  border: 1px solid #D480FF;
+}
+
+.area {
+  position: fixed;
+  z-index: 99;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+  display: none;
+}
+.area .box {
+  width: 100%;
+  height: 8.88rem;
+  border-radius: 0.7466666667rem 0.7466666667rem 0 0;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
+.area .box p {
+  width: 100%;
+  text-align: center;
+  height: 1.8133333333rem;
+  line-height: 1.8133333333rem;
+  border-bottom: 0.0133333333rem solid #EBEEF5;
+  font-size: 0.48rem;
+  font-weight: bold;
+  color: #1F1B4F;
+}
+.area .box .list {
+  position: absolute;
+  left: 0;
+  top: 1.8133333333rem;
+  overflow-y: scroll;
+  width: 100%;
+  height: 7rem;
+}
+.area .box .list span {
+  display: block;
+  width: 100%;
+  height: 1.36rem;
+  line-height: 1.36rem;
+  font-size: 0.4266666667rem;
+  border-bottom: 0.0133333333rem solid #EBEEF5;
+  text-align: center;
+  color: #1F1B4F;
+}
+.area .box .list .active {
+  background: #F3F5FA;
+}
+
+/*# sourceMappingURL=login.css.map */

view/peko/modules/statistic/css/login.scss

@@ -0,0 +1,244 @@
+@function px2rem($px, $rem:75) {
+    @return $px / $rem+rem;
+}
+
+html,
+body {
+    width: 100%;
+}
+
+.back {
+    position: fixed;
+    z-index: 9;
+    width: px2rem(56, );
+    height: px2rem(56, );
+    left: px2rem(40, );
+    top: px2rem(50, );
+    display: none;
+}
+
+.header {
+    width: 100%;
+    height: px2rem(666, );
+    background: url(../images/login/bg.png) no-repeat;
+    background-size: 100% 100%;
+    position: relative;
+    margin: 0 auto -2rem;
+
+    .logo {
+        position: absolute;
+        width: px2rem(428, );
+        height: px2rem(428, );
+        left: 50%;
+        top: px2rem(182, );
+        transform: translateX(-50%);
+
+    }
+}
+
+.box {
+    width: px2rem(750, );
+    height: px2rem(1096, );
+    border-radius: px2rem(50, ) px2rem(50, ) 0px 0px;
+    margin: 0 auto;
+    position: relative;
+    z-index: 2;
+    background: #fff;
+    overflow: hidden;
+
+    input {
+        background: transparent;
+        border: none;
+        outline: none;
+        box-sizing: border-box;
+        padding: 0 px2rem(48, );
+
+        &::placeholder {
+            font-size: px2rem(28, );
+            color: #8A8CAB;
+        }
+    }
+
+    .idLogin {
+        .id {
+            width: px2rem(606, );
+            height: px2rem(104, );
+            background: #F3F5FA;
+            border-radius: px2rem(104, );
+            margin: px2rem(96, ) auto px2rem(40, );
+            display: block;
+        }
+
+        .password {
+            width: px2rem(606, );
+            height: px2rem(104, );
+            background: #F3F5FA;
+            border-radius: px2rem(104, );
+            margin: px2rem(0, ) auto px2rem(80, );
+            display: block;
+        }
+    }
+
+    .phone {
+        display: none;
+
+        .phoneNumberBox {
+            width: px2rem(606, );
+            height: px2rem(104, );
+            background: #F3F5FA;
+            border-radius: px2rem(104, );
+            margin: px2rem(96, ) auto px2rem(40, );
+            box-sizing: border-box;
+            padding-left: px2rem(48, );
+
+            .prefix {
+                float: left;
+                font-size: px2rem(32, );
+                color: #1F1B4F;
+                font-weight: bold;
+                height: 100%;
+                line-height: px2rem(104, );
+
+                b {
+                    font-size: px2rem(32, );
+                    color: #1F1B4F;
+                    font-weight: bold;
+                    margin-right: px2rem(8, );
+                }
+
+                img {
+                    display: inline-block;
+                    width: px2rem(24, );
+                    height: px2rem(16, );
+                    vertical-align: middle;
+                }
+            }
+
+            .phoneNumber {
+                float: right;
+                height: 100%;
+                padding: 0;
+                width: 5.5rem;
+            }
+        }
+
+        .codeBox {
+            width: px2rem(606, );
+            height: px2rem(104, );
+            background: #F3F5FA;
+            border-radius: px2rem(104, );
+            margin: px2rem(0, ) auto px2rem(80, );
+
+            .code {
+                float: left;
+                width: 5rem;
+                height: 100%;
+            }
+
+            .codeBut {
+                text-align: center;
+                color: #FFFFFF;
+                font-size: px2rem(28, );
+                border-radius: px2rem(76, );
+                width: px2rem(204, );
+                height: px2rem(76, );
+                line-height: px2rem(76, );
+                float: right;
+                margin-top: px2rem(14, );
+                margin-right: px2rem(16, );
+                background: #9168FA;
+            }
+
+            .codeButTime {
+                background: #DED1FD;
+            }
+        }
+    }
+
+
+
+    .but {
+        width: px2rem(606, );
+        height: px2rem(96, );
+        border-radius: px2rem(96, );
+        line-height: px2rem(96, );
+        text-align: center;
+        color: #FFFFFF;
+        font-size: px2rem(32, );
+        margin: 0 auto px2rem(40, );
+        background: linear-gradient(90deg, #EEDCFF 0%, #DEE4FF 50%, #CCF8F9 100%);
+    }
+
+    .butok {
+        background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
+    }
+
+    .hone {
+        width: px2rem(606, );
+        height: px2rem(96, );
+        border-radius: px2rem(96, );
+        line-height: px2rem(96, );
+        text-align: center;
+        color: #9168FA;
+        font-size: px2rem(32, );
+        margin: 0 auto px2rem(40, );
+        background: linear-gradient(270deg, #FAEDFF 0%, #E6FDFF 100%);
+        border: 1px solid #D480FF;
+    }
+}
+
+.area {
+    position: fixed;
+    z-index: 99;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, .6);
+    display: none;
+
+    .box {
+        width: 100%;
+        height: px2rem(666, );
+        border-radius: px2rem(56, ) px2rem(56, ) 0 0;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+
+        p {
+            width: 100%;
+            text-align: center;
+            height: px2rem(136, );
+            line-height: px2rem(136, );
+            border-bottom: px2rem(1, ) solid #EBEEF5;
+            font-size: px2rem(36, );
+            font-weight: bold;
+            color: #1F1B4F;
+        }
+
+        .list {
+            position: absolute;
+            left: 0;
+            top: px2rem(136, );
+            overflow-y: scroll;
+            width: 100%;
+            height: 7rem;
+
+            span {
+                display: block;
+                width: 100%;
+                height: px2rem(102, );
+                line-height: px2rem(102, );
+                font-size: px2rem(32, );
+                border-bottom: px2rem(1, ) solid #EBEEF5;
+                text-align: center;
+                color: #1F1B4F;
+            }
+
+            .active {
+                background: #F3F5FA;
+            }
+        }
+    }
+}

view/peko/modules/statistic/css/roomData.css

@@ -9,22 +9,18 @@ body {
   width: 10rem;
   margin: 0 auto;
 }
-
 .max .room-data {
   width: 100%;
-  height: 5.06667rem;
+  height: 5.0666666667rem;
-  background: url("../images/serial.png");
+  background: linear-gradient(0deg, rgba(90, 236, 250, 0.1) 0%, rgba(157, 180, 255, 0.6) 49%, #CF70FF 100%);
-  background-size: 100% 100%;
   overflow: hidden;
 }
-
 .max .room-data p {
   font-size: 0.4rem;
   color: #fff;
-  margin-top: 0.42667rem;
+  margin-top: 0.4266666667rem;
   margin-left: 1rem;
 }
-
 .max .room-data .time {
   margin-top: 0.28rem;
   display: flex;
@@ -32,50 +28,43 @@ body {
   align-items: center;
   color: #fff;
 }
-
 .max .room-data .time div {
   color: #fff;
-  font-size: 0.34667rem;
+  font-size: 0.3466666667rem;
   background: rgba(255, 255, 255, 0.2);
   text-align: center;
   line-height: 0.8rem;
   outline: none;
   display: block;
-  width: 3.46667rem;
+  width: 3.4666666667rem;
   height: 0.8rem;
   border-radius: 0.4rem;
   caret-color: transparent;
 }
-
 .max .room-data .time div#select_0 {
   margin-right: 0.4rem;
 }
-
 .max .room-data .time div#select_1 {
   margin-left: 0.4rem;
 }
-
 .max .tit {
-  width: 8.33333rem;
+  width: 8.3333333333rem;
-  margin: -1.33333rem auto 0;
+  margin: -1.3333333333rem auto 0;
 }
-
 .max .tit p {
   font-size: 0.32rem;
-  color: #999;
+  color: #333;
   line-height: 0.48rem;
 }
-
 .max .button {
-  margin: 4.53333rem auto 0;
+  margin: 4.5333333333rem auto 0;
   font-size: 0.4rem;
   line-height: 1.2rem;
   width: 9.2rem;
   border-radius: 0.6rem;
   text-align: center;
   color: #fff;
-  background-image: linear-gradient(left, #FFA936, #FFCB47);
+  background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
-  background-image: -webkit-linear-gradient(left, #FFA936, #FFCB47);
 }
 
 .toast {
@@ -139,10 +128,9 @@ body {
   background: rgba(0, 0, 0, 0.5);
   z-index: 111;
 }
-
 .pop1 .content {
   width: 8.4rem;
-  height: 4.53333rem;
+  height: 4.5333333333rem;
   background: #fff;
   border-radius: 0.4rem;
   position: absolute;
@@ -150,10 +138,9 @@ body {
   left: 50%;
   transform: translate(-50%, -50%);
 }
-
 .pop1 .content .message_ {
-  padding: 0.37333rem;
+  padding: 0.3733333333rem;
-  font-size: 0.42667rem;
+  font-size: 0.4266666667rem;
   word-wrap: break-word;
   word-break: break-all;
   text-align: center;
@@ -161,9 +148,8 @@ body {
   height: 2.4rem;
   align-items: center;
   justify-content: center;
-  line-height: 0.58667rem;
+  line-height: 0.5866666667rem;
 }
-
 .pop1 .content .butc {
   display: flex;
   position: absolute;
@@ -171,16 +157,16 @@ body {
   width: 100%;
   text-align: center;
 }
-
 .pop1 .content .butc .check1,
 .pop1 .content .butc .cancel1 {
   flex: 1;
-  line-height: 1.33333rem;
+  line-height: 1.3333333333rem;
   font-size: 0.48rem;
   color: #1989fa;
   border-top: 1px solid #ebedf0;
 }
-
 .pop1 .content .butc .cancel1 {
   display: none;
 }
+
+/*# sourceMappingURL=roomData.css.map */

view/peko/modules/statistic/css/roomData.scss

@@ -1,102 +1,104 @@
 @function px2rem($px, $rem:75) {
-  @return $px / $rem+rem;
+    @return $px / $rem+rem;
 }
 
 @import '../../../common/css/flex';
 
 html,
 body {
-  width: 100%;
+    width: 100%;
-  height: 100%;
+    height: 100%;
-  background-color: #F5F5F5;
+    background-color: #F5F5F5;
 }
 
 .max {
-  width: px2rem(750);
+    width: px2rem(750);
-  margin: 0 auto;
+    margin: 0 auto;
 
-  .room-data {
+    .room-data {
-    width: 100%;
+        width: 100%;
-    height: px2rem(380);
+        height: px2rem(380);
-    background: url('../images/serial.png');
+        // background: url('../images/serial.png');
-    background-size: 100% 100%;
+        // background-size: 100% 100%;
-    overflow: hidden;
+        background: linear-gradient(0deg, rgba(90, 236, 250, 0.1) 0%, rgba(157, 180, 255, 0.6) 49%, #CF70FF 100%);
+        overflow: hidden;
 
-    p {
+        p {
-      font-size: px2rem(30);
+            font-size: px2rem(30);
-      color: #fff;
+            color: #fff;
-      margin-top: px2rem(32);
+            margin-top: px2rem(32);
-      margin-left: px2rem(75);
+            margin-left: px2rem(75);
+        }
+
+        .time {
+            margin-top: px2rem(21);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: #fff;
+
+
+            div {
+                color: #fff;
+                font-size: px2rem(26);
+                background: rgba(255, 255, 255, .2);
+                text-align: center;
+                line-height: px2rem(60);
+                outline: none;
+                display: block;
+                width: px2rem(260);
+                height: px2rem(60);
+                border-radius: px2rem(30);
+                caret-color: transparent;
+
+                &#select_0 {
+                    margin-right: px2rem(30);
+                }
+
+                &#select_1 {
+                    margin-left: px2rem(30);
+                }
+            }
+        }
     }
 
-    .time {
+    .tit {
-      margin-top: px2rem(21);
+        width: px2rem(625);
-      display: flex;
+        margin: px2rem(-100) auto 0;
-      justify-content: center;
-      align-items: center;
-      color: #fff;
 
+        p {
+            font-size: px2rem(24);
+            color: #333;
+            line-height: px2rem(36);
+        }
+    }
 
-      div {
+    .button {
-        color: #fff;
+        margin: px2rem(340) auto 0;
-        font-size: px2rem(26);
+        font-size: px2rem(30);
-        background: rgba(255, 255, 255, .2);
+        line-height: px2rem(90);
+        width: px2rem(690);
+        border-radius: px2rem(45);
         text-align: center;
-        line-height: px2rem(60);
+        color: #fff;
-        outline: none;
+        // background-image: linear-gradient(left, #FFA936, #FFCB47);
-        display: block;
+        // background-image: -webkit-linear-gradient(left, #FFA936, #FFCB47);
-        width: px2rem(260);
+        background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
-        height: px2rem(60);
-        border-radius: px2rem(30);
-        caret-color: transparent;
-
-        &#select_0 {
-          margin-right: px2rem(30);
-        }
-
-        &#select_1 {
-          margin-left: px2rem(30);
-        }
-      }
     }
-  }
-
-  .tit {
-    width: px2rem(625);
-    margin: px2rem(-100) auto 0;
-
-    p {
-      font-size: px2rem(24);
-      color: #999;
-      line-height: px2rem(36);
-    }
-  }
-
-  .button {
-    margin: px2rem(340) auto 0;
-    font-size: px2rem(30);
-    line-height: px2rem(90);
-    width: px2rem(690);
-    border-radius: px2rem(45);
-    text-align: center;
-    color: #fff;
-    background-image: linear-gradient(left, #FFA936, #FFCB47);
-    background-image: -webkit-linear-gradient(left, #FFA936, #FFCB47);
-  }
 }
 
 .toast {
-  position: fixed;
+    position: fixed;
-  top: 50%;
+    top: 50%;
-  left: 50%;
+    left: 50%;
-  transform: translate(-50%, -50%);
+    transform: translate(-50%, -50%);
-  width: 60%;
+    width: 60%;
-  line-height: 30px;
+    line-height: 30px;
-  background: rgba(0, 0, 0, .8);
+    background: rgba(0, 0, 0, .8);
-  color: #fff;
+    color: #fff;
-  text-align: center;
+    text-align: center;
-  border-radius: 6px;
+    border-radius: 6px;
-  display: none;
+    display: none;
 }
 
 
@@ -107,40 +109,40 @@ body {
 
 
 .colors {
-  color: #6b57f0 !important;
+    color: #6b57f0 !important;
 }
 
 .mobileSelect .content {
-  width: 96% !important;
+    width: 96% !important;
-  border-radius: 0.3rem !important;
+    border-radius: 0.3rem !important;
-  bottom: 1rem !important;
+    bottom: 1rem !important;
-  margin-left: 2% !important;
+    margin-left: 2% !important;
 }
 
 .cancel {
-  color: #666 !important;
+    color: #666 !important;
 }
 
 .title {
-  color: #333 !important;
+    color: #333 !important;
 }
 
 .ensure {
-  color: #007AFF !important;
+    color: #007AFF !important;
 }
 
 .selectLine {
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
 }
 
 .selectLine span {
-  width: 33.3%;
+    width: 33.3%;
-  height: 40px;
+    height: 40px;
-  display: flex;
+    display: flex;
-  align-items: center;
+    align-items: center;
-  justify-content: flex-end;
+    justify-content: flex-end;
-  padding-bottom: 3px;
+    padding-bottom: 3px;
 }
 
 
@@ -148,63 +150,63 @@ body {
 
 
 .pop1 {
-  width: 100%;
+    width: 100%;
-  height: 100%;
+    height: 100%;
-  position: fixed;
+    position: fixed;
-  top: 0;
+    top: 0;
-  left: 0;
+    left: 0;
-  display: none;
+    display: none;
-  background: rgba(0, 0, 0, .5);
+    background: rgba(0, 0, 0, .5);
-  z-index: 111;
+    z-index: 111;
 
-  .content {
+    .content {
-    width: px2rem(630);
+        width: px2rem(630);
-    height: px2rem(340);
+        height: px2rem(340);
-    background: #fff;
+        background: #fff;
-    border-radius: px2rem(30);
+        border-radius: px2rem(30);
-    position: absolute;
+        position: absolute;
-    top: 46%;
+        top: 46%;
-    left: 50%;
+        left: 50%;
-    transform: translate(-50%, -50%);
+        transform: translate(-50%, -50%);
 
 
 
-    .message_ {
+        .message_ {
-      padding: px2rem(28);
+            padding: px2rem(28);
-      font-size: px2rem(32);
+            font-size: px2rem(32);
-      word-wrap: break-word;
+            word-wrap: break-word;
-      word-break: break-all;
+            word-break: break-all;
-      text-align: center;
+            text-align: center;
-      display: flex;
+            display: flex;
-      height: px2rem(180);
+            height: px2rem(180);
-      align-items: center;
+            align-items: center;
-      justify-content: center;
+            justify-content: center;
-      line-height: px2rem(44);
+            line-height: px2rem(44);
 
 
+        }
+
+        .butc {
+            display: flex;
+
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            text-align: center;
+
+            .check1,
+            .cancel1 {
+                flex: 1;
+                line-height: px2rem(100);
+                font-size: px2rem(36);
+                color: #1989fa;
+                border-top: 1px solid #ebedf0;
+                // font-weight: bold;
+            }
+
+            .cancel1 {
+                display: none;
+            }
+        }
     }
-
-    .butc {
-      display: flex;
-
-      position: absolute;
-      bottom: 0;
-      width: 100%;
-      text-align: center;
-
-      .check1,
-      .cancel1 {
-        flex: 1;
-        line-height: px2rem(100);
-        font-size: px2rem(36);
-        color: #1989fa;
-        border-top: 1px solid #ebedf0;
-        // font-weight: bold;
-      }
-
-      .cancel1 {
-        display: none;
-      }
-    }
-  }
 }

view/peko/modules/statistic/css/serial.css

@@ -13,265 +13,286 @@ body {
   position: relative;
   margin: 0 auto;
 }
-
 .max .starlet {
   width: 100%;
-  height: 5.06667rem;
+  height: 5.3rem;
-  background: url("../images/serial.png");
+  background: linear-gradient(0deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
-  background-size: 100% 100%;
   z-index: 1000;
   overflow: hidden;
   cursor: pointer;
 }
-
 .max .starlet img {
-  width: 3.58667rem;
+  width: 1.7333333333rem;
-  height: 0.98667rem;
+  height: 1.6rem;
   display: block;
-  margin: 0.97333rem auto 0;
+  margin: 0.9733333333rem auto 0;
+  border-radius: 0.2666666667rem;
 }
-
 .max .starlet img.peko {
   width: 2.48rem;
-  height: 1.01333rem;
+  height: 1.0133333333rem;
 }
-
 .max .userInfo {
   width: 9.2rem;
   height: 2rem;
   margin: 0 auto;
   border-radius: 0.32rem;
-  margin-top: 0.53333rem;
+  margin-top: 0.5333333333rem;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
   background-color: #fff;
 }
-
 .max .userInfo .user-i {
   width: 70%;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
   -ms-justify-content: flex-start;
   justify-content: flex-start;
   justify-content: center;
   flex-direction: column;
 }
-
 .max .userInfo .user-i > div {
   width: 100%;
-  height: 1.06667rem;
+  height: 1.0666666667rem;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
   line-height: 1.4rem;
 }
-
 .max .userInfo .user-i > div:first-child {
   font-size: 0.4rem;
   color: #333;
-  margin-left: 0.38667rem;
+  margin-left: 0.3866666667rem;
 }
-
 .max .userInfo .user-i > div:last-child {
   color: #999;
   font-size: 0.32rem;
-  line-height: 0.86667rem;
+  line-height: 0.8666666667rem;
 }
-
 .max .userInfo .user-i > div label {
-  margin-left: 0.38667rem;
+  margin-left: 0.3866666667rem;
 }
-
 .max .userInfo .user-i > div .erbanNo {
-  margin-left: 0.26667rem;
+  margin-left: 0.2666666667rem;
 }
-
 .max .userInfo .user-room-receipt {
-  width: 2.66667rem;
+  width: 2.6666666667rem;
   height: 0.64rem;
   border-radius: 0.32rem;
-  font-size: 0.37333rem;
+  font-size: 0.3733333333rem;
   color: #fff;
   text-align: center;
   line-height: 0.64rem;
-  margin-right: 0.26667rem;
+  margin-right: 0.2666666667rem;
-  background-image: linear-gradient(to right, #FFA936, #FFCB47);
+  background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
-  background-image: -webkit-linear-gradient(to right, #FFA936, #FFCB47);
 }
-
 .max .serial {
   width: 9.2rem;
   margin: 0 auto;
   overflow: hidden;
   border-radius: 0.32rem;
   background: #fff;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
   -ms-justify-content: center;
   justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
+  -webkit-box-orient: vertical;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
   flex-direction: column;
-  margin-top: 0.26667rem;
+  margin-top: 0.2666666667rem;
 }
-
 .max .serial li {
   width: 100%;
   height: 2rem;
   background-color: white;
   border-bottom: 1px solid #EFEFEF;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
   -ms-justify-content: flex-start;
   justify-content: flex-start;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
 }
-
 .max .serial li p {
   flex: 1;
-  height: 1.33333rem;
+  height: 1.3333333333rem;
   color: #333;
 }
-
 .max .serial li p:first-child {
   text-align: center;
   border-right: 1px solid lightgray;
-  width: 5.33333rem;
+  width: 5.3333333333rem;
   font-size: 18px;
-  line-height: 1.33333rem;
+  line-height: 1.3333333333rem;
   font-weight: bold;
 }
-
 .max .serial li p.content {
-  width: 5.33333rem;
+  width: 5.3333333333rem;
   text-align: center;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   justify-content: center;
 }
-
 .max .serial li p.content span {
   display: block;
   width: 100%;
   font-size: 18px;
   line-height: 18px;
-  font-size: 0.29333rem;
+  font-size: 0.2933333333rem;
 }
-
 .max .serial li p.content span:first-child {
   color: #FFBC52;
   font-size: 0.4rem;
 }
-
 .max .serial li p.content span.name {
   color: #999999;
 }
-
 .max .serial .week {
   background-color: #fff;
   width: 100%;
   height: 2rem;
   border-bottom: 1px solid #EFEFEF;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
   -ms-justify-content: flex-start;
   justify-content: flex-start;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
 }
-
 .max .serial .week p {
   border: 0;
   flex: 1;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
   -ms-justify-content: center;
   justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
 }
-
 .max .serial .week p.weeks {
   text-align: center;
   border-right: 1px solid lightgray;
-  width: 5.33333rem;
+  width: 5.3333333333rem;
   font-size: 18px;
-  line-height: 1.33333rem;
+  line-height: 1.3333333333rem;
   font-weight: bold;
 }
-
 .max .serial .week p.content {
   box-sizing: border-box;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
   flex-direction: column;
   line-height: 18px;
 }
-
 .max .serial .week p.content .number {
   color: #FFBC52;
   font-size: 0.4rem;
 }
-
 .max .serial .week p.content .name {
   text-align: center;
   color: #999999;
-  font-size: 0.29333rem;
+  font-size: 0.2933333333rem;
 }
-
 .max .serial .month {
   background-color: #F5F5F5;
   width: 100%;
   height: 2rem;
   border-bottom: 1px solid #EFEFEF;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
   -ms-justify-content: flex-start;
   justify-content: flex-start;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
 }
-
 .max .serial .month p {
   border: 0;
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
   -ms-justify-content: center;
   justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
 }
-
 .max .serial .month p.date {
-  width: 2.66667rem;
+  width: 2.6666666667rem;
   font-weight: bold;
   color: #CCCCCC;
   line-height: 18px;
   font-size: 18px;
 }
-
 .max .serial .month p.content {
+  display: -webkit-flex;
   display: flex;
   display: -moz-box;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
   -ms-justify-content: center;
   justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
   -ms-align-items: center;
   align-items: center;
+  -webkit-box-orient: vertical;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
   flex-direction: column;
   padding-left: 30px;
   line-height: 18px;
 }
-
 .max .serial .month p.content .number {
   font-size: 18px;
-  margin-bottom: 0.13333rem;
+  margin-bottom: 0.1333333333rem;
 }
-
 .max .serial .month p.content .name {
   color: #CCCCCC;
 }
+
+/*# sourceMappingURL=serial.css.map */

view/peko/modules/statistic/css/serial.scss

@@ -21,19 +21,22 @@ body {
 
     .starlet {
         width: 100%;
-        height: px2rem(380);
+        height: 5.3rem;
-        background: url('../images/serial.png');
+        // background: url('../images/serial.png');
-        background-size: 100% 100%;
+        // background-size: 100% 100%;
+        background: linear-gradient(0deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
         z-index: 1000;
         overflow: hidden;
         cursor: pointer;
 
         img {
-            width: px2rem(269);
+            width: px2rem(130);
-            height: px2rem(74);
+            height: px2rem(120);
             display: block;
             margin: px2rem(73) auto 0;
-            &.peko{
+            border-radius: px2rem(20, );
+
+            &.peko {
                 width: px2rem(186, );
                 height: px2rem(76, );
             }
@@ -95,7 +98,8 @@ body {
                 }
             }
         }
-        .user-room-receipt{
+
+        .user-room-receipt {
             width: px2rem(200);
             height: px2rem(48);
             border-radius: px2rem(24);
@@ -104,8 +108,9 @@ body {
             text-align: center;
             line-height: px2rem(48);
             margin-right: px2rem(20);
-            background-image: linear-gradient(to right,#FFA936,#FFCB47);
+            // background-image: linear-gradient(to right,#FFA936,#FFCB47);
-            background-image: -webkit-linear-gradient(to right,#FFA936,#FFCB47);
+            // background-image: -webkit-linear-gradient(to right,#FFA936,#FFCB47);
+            background: linear-gradient(90deg, #5AECFA 0%, #9DB4FF 49%, #CF70FF 100%);
         }
 
     }
@@ -135,6 +140,7 @@ body {
                 flex: 1;
                 height: px2rem(100);
                 color: #333;
+
                 &:first-child {
                     text-align: center;
                     border-right: 1px solid lightgray;
@@ -151,18 +157,21 @@ body {
                     flex-direction: column;
                     flex-direction: column;
                     justify-content: center;
-                    &:last-child {
+
-                    }
+                    &:last-child {}
+
                     span {
                         display: block;
                         width: 100%;
                         font-size: 18px;
                         line-height: 18px;
                         font-size: px2rem(22);
-                        &:first-child{
+
+                        &:first-child {
                             color: #FFBC52;
                             font-size: px2rem(30);
                         }
+
                         &.name {
                             color: #999999;
                         }

view/peko/modules/statistic/js/login.js

@@ -0,0 +1,259 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+var urlData = getQueryString();
+let env = EnvCheck();
+if (env == 'test') {
+    new VConsole();
+}
+// 封裝layer消息提醒框
+let layerIndex
+const showLoading = (content = '加載中...') => {
+    layer.open({
+        type: 2,
+        shadeClose: false,
+        content,
+        success (e) {
+            layerIndex = $(e).attr('index')
+        }
+    })
+}
+const hideLoading = (index) => {
+    layer.close(index)
+}
+const toastMsg = (content = '操作完成', time = 2) => {
+    layer.open({
+        content,
+        time,
+        skin: 'msg'
+    })
+}
+var idOrPhone = true;//判斷id登入或手機號登入
+var times = 0;//倒計時計時器
+var isClick = true;//判斷是否再次獲取驗證碼
+var token;
+$(function () {
+    setTimeout(function () {
+        getInfoFromClient()
+        setTimeout(function () {
+            getAreaInfo();
+        }, 100)
+    })
+})
+
+// 獲取驗證碼接口
+function getCode () {
+    var mobileDes = encryptDes(`${$('.box .phone .phoneNumberBox .prefix b').text()}${$('.box .phone .phoneNumberBox .phoneNumber').val()}`, '1ea53d260ecf11e7b56e00163e046a26');
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/sms/getCode',
+        headers: { "pub_uid": "0" },
+        data: { mobile: mobileDes, phoneAreaCode: $('.box .phone .phoneNumberBox .prefix b').text(), type: 2 },
+        success (res) {
+            if (res.code === 200) {
+                toastMsg(res.message);
+                $('.box .phone .codeBox .codeBut').addClass('codeButTime')
+                timerFun()
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// ticket接口 
+function ticket () {
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/oauth/ticket',
+        data: { issue_type: "multi", access_token: token },
+        success (res) {
+            if (res.code === 200) {
+                sessionStorage.setItem("uid", res.data.uid);
+                sessionStorage.setItem("ticket", res.data.tickets[0].ticket);
+                window.location.href = `./serial.html?codes=${urlData.codes}==`
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 登入接口 
+function oauthToken () {
+    if (idOrPhone) {
+        var phone = encryptDes($('.box .idLogin .id').val(), '1ea53d260ecf11e7b56e00163e046a26');
+        var password = encryptDes($('.box .idLogin .password').val(), '1ea53d260ecf11e7b56e00163e046a26');
+    } else {
+        var phone = $('.box .phone .phoneNumberBox .phoneNumber').val();
+        var code = $('.box .phone .codeBox .code').val();
+        var phoneAreaCode = $('.box .phone .phoneNumberBox .prefix b').text();
+    }
+    showLoading()
+    networkRequest({
+        type: 'POST',
+        url: urlPrefix + '/oauth/h5/token',
+        data: idOrPhone ? {
+            "grant_type": "password", phone, password,
+        } :
+            { grant_type: 'verify_code', phoneAreaCode, phone: `${phoneAreaCode}${phone}`, code, },
+        success (res) {
+            if (res.code === 200) {
+                token = res.data.access_token;
+                // ticket();
+                sessionStorage.setItem("uid", res.data.uid);
+                sessionStorage.setItem("ticket", token);
+                window.location.href = `./serial.html?codes=${urlData.codes}==`
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 區號接口
+function getAreaInfo () {
+    showLoading()
+    networkRequest({
+        type: 'GEt',
+        url: urlPrefix + '/areaInfo/list',
+        success (res) {
+            if (res.code === 200) {
+                var str = '';
+                res.data.forEach((res, i) => {
+                    str += `
+
+                        <span>${res.name} +${res.phoneAreaCode}</span>
+                    `
+                });
+                $('.area .box .list').append(str);
+                $('.area .box .list span').click(function () {
+                    $('.box .phone .phoneNumberBox .prefix b').text($(this).text().replace(/[^0-9]/gi, ''));
+                    $(this).addClass('active').siblings().removeClass('active');
+                })
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error (err) {
+            hideLoading(layerIndex)
+            toastMsg('網絡錯誤，請退出重進')
+        }
+    })
+}
+// 點擊獲取驗證碼
+$('.box .phone .codeBox .codeBut').click(function () {
+    var val = $('.box .phone .phoneNumberBox .phoneNumber').val();
+    if (val == '') {
+        toastMsg('請輸入手機號')
+        return
+    }
+    if (isClick) {
+        getCode()
+    }
+
+})
+// 倒計時
+function timerFun () {
+    isClick = false;
+    times = 59;
+    // 開啟定時器
+    var timer = setInterval(function () {
+        // 判斷剩余秒數
+        if (times == 0) {
+            // 清除定時器和復原按鈕
+            clearInterval(timer);
+            $('.box .phone .codeBox .codeBut').text('獲取驗證碼');
+            $('.box .phone .codeBox .codeBut').removeClass('codeButTime')
+            isClick = true;
+        } else {
+            $('.box .phone .codeBox .codeBut').text(`${times}秒`);
+            times--;
+        }
+    }, 1000);
+}
+// 切換登入方式按鈕
+$('.box .hone').click(function () {
+    idOrPhone = !idOrPhone;
+    $('.box .phone .phoneNumberBox .phoneNumber,.box .phone .codeBox .code,.box .idLogin .id,.box .idLogin .password').val('');
+    $('.box .but').removeClass('butok');
+    if (idOrPhone) {
+        $('.idLogin').show();
+        $('.phone').hide();
+        $('.box .hone').text('Peko手機號登錄');
+    } else {
+        $('.phone').show();
+        $('.idLogin').hide();
+        $('.box .hone').text('Peko賬號登錄');
+    }
+})
+// 打開選擇區號
+$('.box .phone .phoneNumberBox .prefix').click(function () {
+    $('.area').show();
+    return false;
+})
+// 關閉選擇區號
+$('.area').click(function () {
+    $('.area').hide();
+    return false;
+})
+//監聽是否可以登入函數
+function phoneFun () {
+    var num1 = $(".box .idLogin .id").val();
+    var num2 = $(".box .idLogin .password").val();
+    var num3 = $(".box .phone .phoneNumberBox .phoneNumber").val();
+    var num4 = $(".box .phone .codeBox .code").val();
+    if (num1 != '' && num2 != '' || num3 != '' && num4 != '') {
+        $('.box .but').addClass('butok');
+        return true;
+    } else {
+        $('.box .but').removeClass('butok');
+        return false;
+    }
+}
+// 監聽賬號輸入
+$(".box .idLogin .id").on("keyup", function () {
+    phoneFun()
+});
+// 監聽密碼輸入
+$(".box .idLogin .password").on("keyup", function () {
+    phoneFun()
+});
+// 監聽手機號輸入
+$(".box .phone .phoneNumberBox .phoneNumber").on("keyup", function () {
+    phoneFun()
+});
+// 監聽驗證碼輸入
+$(".box .phone .codeBox .code").on("keyup", function () {
+    phoneFun()
+});
+// 登入按鈕
+$('.box .but').click(function () {
+    if (phoneFun()) {
+        oauthToken();
+    }
+})
+
+//DES加密
+const encryptDes = (message, key) => {
+    var keyHex = CryptoJS.enc.Utf8.parse(key);
+    var encrypted = CryptoJS.DES.encrypt(message, keyHex, {
+        mode: CryptoJS.mode.ECB,
+        padding: CryptoJS.pad.Pkcs7
+    });
+    return encrypted.toString();
+}

view/peko/modules/statistic/js/roomData.js

@@ -6,121 +6,147 @@ let info = {}
 let sevenDaysAgo = 0
 let start = 0, end = 0, urlData = '1', env = EnvCheck()
 $(function () {
-  if (env == 'test') {
+    getInfoFromClient()
-    var vConsole = new VConsole();
+    if (env == 'test') {
-  }
+        var vConsole = new VConsole();
-
-  //初始化时间插件
-
-  //给月份加个0
-  function dateFormat(date) {
-    if (date >= 10) return date
-    return '0' + date
-  }
-
-  //点击弹窗
-  $('.check1').on('click', function () {
-    $('.pop1').fadeOut(100)
-  })
-  // 获取uid ticket
-  let main = {
-    init() {
-      //获取uid
-      this.getUid();
-      //初始化时间插件
-      this.initTime()
-      //调用接口，拿到下载链接
-      this.getUrl()
-    },
-    getUid() {
-      if (browser.app) {
-        if (browser.ios) {
-          info.uid = tools.cookieUtils.get('uid');
-          window.webkit.messageHandlers.getTicket.postMessage(null);
-        } else if (browser.android) {
-          if (androidJsObj && typeof androidJsObj === 'object') {
-            info.uid = parseInt(window.androidJsObj.getUid());
-            info.ticket = window.androidJsObj.getTicket();
-          }
-        }
-      }
-    },
-    initTime() {
-      $.selectYY_MM_DD("#select_0", {}, function (data) {
-        let time = `${data.year}-${data.month}-${data.day}`
-        $('#select_0').html(time)
-        start = time
-        sevenDaysAgo = new Date(time).getTime()
-      })
-      $.selectYY_MM_DD("#select_1", {}, function (data) {
-        let time = `${data.year}-${data.month}-${data.day}`
-        $('#select_1').html(time)
-        end = time
-        now = new Date(time).getTime()
-      })
-    },
-    getUrl() {
-      $('.button').on('click', function () {
-        let headers;
-        if (browser.app) {
-          headers = {
-            'pub_ticket': info.ticket,
-            'pub_uid': info.uid,
-          }
-        } else {
-          headers = {
-            'h5_token': window.sessionStorage.getItem('ticket'),
-            'pub_uid': window.sessionStorage.getItem('uid'),
-          }
-        }
-        console.log(headers, 'need login')
-        let nowTime0 = new Date().getUTCFullYear()
-        let nowTime1 = dateFormat(new Date().getMonth() + 1)
-        let nowTime2 = new Date().getDate()
-        let nowTime = new Date(`${nowTime0}-${nowTime1}-${nowTime2}`).getTime()
-        if (!sevenDaysAgo || !now) {
-          return $('.toast').html('请选择时间').stop().fadeIn(0).fadeOut(4000)
-        }
-        if (sevenDaysAgo > now) {
-          return $('.toast').html('起始时间应该小于等于最终时间').stop().fadeIn(0).fadeOut(4000)
-        } else if (now - sevenDaysAgo > 518400000) {
-          $('.toast').html('时间间隔在7天之内').stop().fadeIn(0).fadeOut(4000)
-        } else if (nowTime === now) {
-          $('.toast').html(`结束时间最晚应该是${nowTime0}-${nowTime1}-${nowTime2 - 1}`).stop().fadeIn(0).fadeOut(4000)
-        }
-        else {
-          $.ajax({
-            url: queryObj.isSingle ? "/room/revenue/singleroom/exportExcel" : "/room/revenue/exportExcel",
-            type: 'get',
-            headers: headers,
-            data: {
-              end: end,
-              start: start,
-              erbanNo: getQueryString().erbanNo
-            },
-            success(res) {
-              urlData = res.data.url
-              $('.pop1').fadeIn(100)
-              $.copy({
-                text: "复制成功", //分享提示文案
-                copyUrl: urlData, //自定义复制链接地址
-                tipTime: 1000, //分享提示消失时间
-                copyId: "#confirm1" //复制按钮id
-              });
-            },
-            error(err) {
-              console.log(err)
-              // $('.pop1').fadeIn(100)
-              // urlData = '55555'
-            }
-          })
-        }
-      })
     }
-  }
+
-  main.init()
+    //初始化时间插件
-  //点击获取下载链接
+
+    //给月份加个0
+    function dateFormat (date) {
+        if (date >= 10) return date
+        return '0' + date
+    }
+
+    //点击弹窗
+    $('.check1').on('click', function () {
+        $('.pop1').fadeOut(100)
+    })
+    // 获取uid ticket
+    let main = {
+        init () {
+            //获取uid
+            this.getUid();
+            //初始化时间插件
+            this.initTime()
+            //调用接口，拿到下载链接
+            this.getUrl()
+        },
+        getUid () {
+            if (browser.app) {
+                if (browser.ios) {
+                    info.uid = tools.cookieUtils.get('uid');
+                    window.webkit.messageHandlers.getTicket.postMessage(null);
+                } else if (browser.android) {
+                    if (androidJsObj && typeof androidJsObj === 'object') {
+                        info.uid = parseInt(window.androidJsObj.getUid());
+                        info.ticket = window.androidJsObj.getTicket();
+                    }
+                }
+            }
+        },
+        initTime () {
+            $.selectYY_MM_DD("#select_0", {}, function (data) {
+                let time = `${data.year}-${data.month}-${data.day}`
+                $('#select_0').html(time)
+                start = time
+                sevenDaysAgo = new Date(time).getTime()
+            })
+            $.selectYY_MM_DD("#select_1", {}, function (data) {
+                let time = `${data.year}-${data.month}-${data.day}`
+                $('#select_1').html(time)
+                end = time
+                now = new Date(time).getTime()
+            })
+        },
+        getUrl () {
+            $('.button').on('click', function () {
+                let headers;
+                if (browser.app) {
+                    headers = {
+                        'pub_ticket': info.ticket,
+                        'pub_uid': info.uid,
+                    }
+                } else {
+                    headers = {
+                        'h5_token': window.sessionStorage.getItem('ticket'),
+                        'pub_uid': window.sessionStorage.getItem('uid'),
+                    }
+                }
+                console.log(headers, 'need login')
+                let nowTime0 = new Date().getUTCFullYear()
+                let nowTime1 = dateFormat(new Date().getMonth() + 1)
+                let nowTime2 = new Date().getDate()
+                let nowTime = new Date(`${nowTime0}-${nowTime1}-${nowTime2}`).getTime()
+                if (!sevenDaysAgo || !now) {
+                    return $('.toast').html('请选择时间').stop().fadeIn(0).fadeOut(4000)
+                }
+                if (sevenDaysAgo > now) {
+                    return $('.toast').html('起始时间应该小于等于最终时间').stop().fadeIn(0).fadeOut(4000)
+                } else if (now - sevenDaysAgo > 518400000) {
+                    $('.toast').html('时间间隔在7天之内').stop().fadeIn(0).fadeOut(4000)
+                } else if (nowTime === now) {
+                    $('.toast').html(`结束时间最晚应该是${nowTime0}-${nowTime1}-${nowTime2 - 1}`).stop().fadeIn(0).fadeOut(4000)
+                }
+                else {
+                    // $.ajax({
+                    //     url: queryObj.isSingle ? "/room/revenue/singleroom/exportExcel" : "/room/revenue/exportExcel",
+                    //     type: 'get',
+                    //     headers: headers,
+                    //     data: {
+                    //         end: end,
+                    //         start: start,
+                    //         erbanNo: getQueryString().erbanNo
+                    //     },
+                    //     success (res) {
+                    //         urlData = res.data.url
+                    //         $('.pop1').fadeIn(100)
+                    //         $.copy({
+                    //             text: "复制成功", //分享提示文案
+                    //             copyUrl: urlData, //自定义复制链接地址
+                    //             tipTime: 1000, //分享提示消失时间
+                    //             copyId: "#confirm1" //复制按钮id
+                    //         });
+                    //     },
+                    //     error (err) {
+                    //         console.log(err)
+                    //         // $('.pop1').fadeIn(100)
+                    //         // urlData = '55555'
+                    //     }
+                    // })
+                    networkRequest({
+                        type: 'GET',
+                        url: queryObj.isSingle ? getUrlPrefix() + "/room/revenue/singleroom/exportExcel" : getUrlPrefix() + "/room/revenue/exportExcel",
+                        data: {
+                            end: end,
+                            start: start,
+                            erbanNo: getQueryString().erbanNo
+                        },
+                        success (res) {
+                            if (res.code === 200) {
+                                urlData = res.data.url
+                                $('.pop1').fadeIn(100)
+                                $.copy({
+                                    text: "复制成功", //分享提示文案
+                                    copyUrl: urlData, //自定义复制链接地址
+                                    tipTime: 1000, //分享提示消失时间
+                                    copyId: "#confirm1" //复制按钮id
+                                });
+                            } else {
+                            }
+                        },
+                        error (err) {
+                            console.log(err)
+                        }
+                    })
+                }
+            })
+        }
+    }
+    main.init()
+    //点击获取下载链接
 })
-function getMessage(key, value) {
+function getMessage (key, value) {
-  info[key] = value;
+    info[key] = value;
 }

view/peko/modules/statistic/js/serial.js

@@ -60,7 +60,7 @@ $(function () {
         },
 
         getDataFromBack: function () {
-            var api = locateJudge();
+            var api = getUrlPrefix();
             setTimeout(function () {
                 // $.get('https://beta.api.pekolive.com//room/serials?codes=ZjU2ZTQ=', function (res) {
                 $.get(api + '/room/serials', { codes: queryString.codes + '=' }, function (res) {

view/peko/modules/statistic/login.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>登入</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/login.css">
+</head>
+
+<body>
+    <!-- 返回 -->
+    <img src="./images/back.png" alt="" class="back">
+    <!-- 頭部 -->
+    <div class="header">
+        <img src="./images/login/logo.png" alt="" class="logo">
+    </div>
+    <!-- 底部登入 -->
+    <div class="box">
+        <!-- 賬號登入 -->
+        <div class="idLogin">
+            <input type="number" class="id" placeholder="請輸入Peko賬號">
+            <input type="password" class="password" placeholder="請輸入密碼">
+        </div>
+        <!-- 手機號登入 -->
+        <div class="phone">
+            <div class="phoneNumberBox">
+                <div class="prefix">
+                    +<b>852</b><img src="./images/login/more.png" alt="" class="more">
+                </div>
+                <input type="number" class="phoneNumber" placeholder="請輸入手機號">
+            </div>
+            <div class="codeBox">
+                <input type="number" class="code" placeholder="請獲取驗證碼">
+                <div class="codeBut">獲取驗證碼</div>
+            </div>
+        </div>
+        <!-- 登入按鈕 -->
+        <div class="but">登錄</div>
+        <div class="hone">Peko手機號登錄</div>
+    </div>
+    <!-- 區號選擇 -->
+    <div class="area">
+        <div class="box">
+            <p>請選擇區號</p>
+            <div class="list">
+                <!-- <span>123123</span> -->
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="../../common/js/svga.min.js"></script>
+<script src="../../common/js/crypto-js.js"></script>
+<script src="./js/login.js?v=1.0"></script>

view/peko/modules/statistic/roomData.html

@@ -46,7 +46,7 @@
   <!-- <a href="http://image.uat.zhongjialx.com/room_revenue/room_954178_20200515_20200515.xlsx"></a> -->
 </body>
 <script src="../../common/js/jquery-3.2.1.min.js"></script>
-<script src="../../common/js/common.js"></script>
+<script src="../../common/js/common2.js"></script>
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="./js/mobileSelect.js"></script>
 <script src="./js/selectDate.js"></script>

view/peko/modules/statistic/serial.html

@@ -17,7 +17,7 @@
 <body>
     <div class="max">
         <div class="starlet">
-            <img src="./images/logo.png" alt="">
+            <img src="./images/logo1.png" alt="">
             <div class="userInfo">
                 <div class="user-i">
                     <div class="info">房间名字：

view/peko/vue-project/myincome/src/view/myincome/GoldLog.vue

@@ -48,7 +48,7 @@
           <div class="item">
             <div class="item-left">
               <div v-if="tableType == 1" class="item-left-title">礼物收入</div>
-              <div v-if="tableType == 4" class="item-left-title">分成收入</div>
+              <div v-if="tableType == 4" class="item-left-title">{{item1.objType == 26 ? '官方赠送金币':'分成收入'}}</div>
               <div v-if="tableType == 9" class="item-left-title">{{item1.amount | abs}}金币提现</div>
               <div v-if="tableType == 10" class="item-left-title">{{item1.amount | abs}}金币兑换钻石</div>
               <div class="item-left-dsc">{{dateFormat(item1.recordTime)}}</div>

view/peko/vue-project/myincome/src/view/myincome/MyIncome.vue

@@ -872,7 +872,7 @@ export default {
         return;
       }
       window.location.href =
-        "http://api.lecheng163.com/peko/modules/statistic/serial.html?codes=" +
+        "https://api.pekolive.com/peko/modules/statistic/serial.html?codes=" +
         this.runningWater.roomUidEncode;
     },
 

view/peko/vue-project/wishRank/src/view/rank/Rank.vue

@@ -200,7 +200,7 @@ export default {
       },
       //判断日榜与周榜状态
       chooseType: 1,
-      tabList: ["爱意榜", "魅力榜", "房间榜", "公会周榜"],
+      tabList: ["爱意榜", "魅力榜", "房间榜", "公会榜"],
       //切换时换背景图
       tabclass: [
         "topThree-user",