隐藏塔罗充值弹窗，增加roomuid

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();

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

@@ -1,4 +1,3 @@
-html,
 body {
   width: 100%;
   height: 21.6533333333rem;
@@ -278,11 +277,11 @@ body {
 }
 .tarotBox .gonggao {
   width: 100%;
-  height: 1.1rem;
+  height: 1.3rem;
   box-sizing: border-box;
   position: absolute;
   left: 0;
-  top: 12.5rem;
+  top: 12.25rem;
   overflow: hidden;
 }
 .tarotBox .gonggao .ul1 {
@@ -507,6 +506,7 @@ h3 {
 }
 
 .shade-mask-fragmentNum {
+  display: none;
   position: fixed;
   top: 0;
   left: 0;

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

@@ -2,7 +2,6 @@
     @return $px / $rem+rem;
 }
 
-html,
 body {
     width: 100%;
     height: px2rem(1624, );
@@ -325,11 +324,11 @@ body {
 
     .gonggao {
         width: 100%;
-        height: 1.1rem;
+        height: 1.3rem;
         box-sizing: border-box;
         position: absolute;
         left: 0;
-        top: 12.5rem;
+        top: 12.25rem;
         overflow: hidden;
 
         .ul1 {
@@ -587,7 +586,7 @@ h3 {
 
 // 碎片不足弹窗
 .shade-mask-fragmentNum {
-    // display: none;
+    display: none;
     position: fixed;
     top: 0;
     left: 0;

view/peko/modules/luckyTarot/index.html

@@ -20,7 +20,7 @@
     </div>
     <!-- 主视觉 -->
     <img src="./images/header.png" alt="" class="header">
-    <!-- 十倍金币 -->
+    <!-- 十倍鉆石 -->
     <img src="./images/10Gold.png" alt="" class="gold_10">
     <!-- 玩法介绍 -->
     <div class="rule">玩法介绍</div>
@@ -84,7 +84,7 @@
         </div>
         <!-- 选择文按提示 -->
         <div class="cardBoxText">
-            <p>供选择 <b>0</b> 张</p>
+            <p>共选择 <b>0</b> 张</p>
             <p>获得<i>0</i>钻石的概率为<b>0%</b></p>
         </div>
         <!-- 没中文案提示 -->

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

@@ -34,6 +34,7 @@ var prodIdActive;
 var lock = true;//鎖
 var page = 1;//頁碼
 var scrollLock = true;
+var arrLast = []//记录上次开奖的数组
 // 初始化函數
 $(function () {
     setTimeout(function () {
@@ -221,7 +222,7 @@ const draw = () => {
                 lock = true;
                 $('.shade-mask-fragmentNum').show();
                 bodyScroolFun(true);
-                toastMsg(res.message);
+                // toastMsg(res.message);
             } else {
                 lock = true;
                 toastMsg(res.message);
@@ -237,7 +238,22 @@ const draw = () => {
     })
 }
 // 恢復初始樣式函數
-function initialStytle () {
+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 = [];
@@ -248,7 +264,7 @@ function initialStytle () {
 
     // 恢復默認選擇文案
     $('.tarotBox .cardBoxText').html(`
-        <p>供選擇 <b>${cardArr.length}</b> 張</p>
+        <p>共選擇 <b>${cardArr.length}</b> 張</p>
         <p>翻到鉆石卡的概率為<b>${cardArr.length * 10}%</b></p>
     `);
     // 清除中獎&未中獎樣式
@@ -265,6 +281,7 @@ function initialStytle () {
 }
 // 處理動效
 function kineticEffect (arr, bool, data) {
+    arrLast = arr;
     arr.forEach((res, i) => {
         $(`.tarotBox .cardBox${res}`).css({
             transition: ' all 1s',
@@ -357,7 +374,7 @@ function tarotBox (dom, i, type) {
             cardArr.splice(cardArr.indexOf(i), 1);
         }
         $('.tarotBox .cardBoxText').html(`
-        <p>供選擇 <b>${cardArr.length}</b> 張</p>
+        <p>共選擇 <b>${cardArr.length}</b> 張</p>
         <p>翻到鉆石卡的概率為<b>${cardArr.length * 10}%</b></p>
     `);
         console.log(cardArr);
@@ -375,7 +392,7 @@ $('.tarotBox .cardBoxBut').click(function () {
 })
 // 再翻一次按鈕
 $('.butAgain').click(function () {
-    initialStytle();
+    initialStytle(true);
 })
 // 跳轉充值頁面
 $('.tarotBox .diamond').click(() => {