1.1.0：将深海奇缘改成奇遇森林

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

@@ -8,8 +8,8 @@ const showLoading = () => {
     layer.open({
         type: 2,
         shadeClose: false,
-        content: '加載中...',
-        success(e) {
+        content: '加载中...',
+        success (e) {
             layerIndex = $(e).attr('index')
         }
     })
@@ -40,94 +40,78 @@ const getUserRecord = () => {
             page,
             pageSize
         },
-        success(res){
-            if(res.code === 200){
-                if(res.data.length === pageSize){
+        success (res) {
+            if (res.code === 200) {
+                if (res.data.length === pageSize) {
                     // 能够继续请求下一页
                     canNext = true
-                }else{
+                } else {
                     canNext = false
                 }
                 recordList.push(...res.data)
-                renderRecord()
+                renderRecord(res)
                 isLock = true
-            }else{
+            } else {
                 toastMsg(res.message)
             }
         },
-        error(err){
-            toastMsg('網絡錯誤')
+        error (err) {
+            toastMsg('网络错误')
         }
     })
 }
 // 渲染游戏记录
-const renderRecord = () => {
-    if(recordList.length === 0){
-        $('.record-list').html('<li class="no-record">暂无游戏记录</li>')
-    }else{
-        let str = ''
-        recordList.map((item, index) => {
-            let drawId = item.drawId
-            // 渲染li里面的ul
-            let str1 = ''
-            item.results.map((item1, index) => {
-                
-                str1 += `
-                    <li class="animal-item">
-                        <div><img src="${item1.itemUrl}" alt=""></div>
-                        <span>+${item1.costPiece}</span>
-                    </li>
-                `
-    
-                if(item1.itemId === drawId){
-                    $('.none').html(str1)
-                    $('.none').find('li').eq(index).addClass('active')
-                    str1 = $('.none').html()
-                }
-            })
-    
-            // 渲染li
-            let text = ''
-            if(item.drawStatus === 1){
-                text = '厉害~猜对了(*^▽^*)'
-            }else{
-                text = '哎呀~猜错了o(╥﹏╥)o'
-            }
+const renderRecord = (res) => {
+    if (recordList.length === 0) {
+        $('.record-list').hide();
+        $('.img').show();
+    } else {
+        $('.record-list').show();
+        $('.img').hide();
+        var str = '';
+        let str2 = '';
+        let drawId = [];;
+        var results = [];
+        console.log(res.data)
+        res.data.forEach((res, index) => {
+            drawId.push(res.drawId);
             str += `
-                <li class="record-item">
-                    <div class="time">${dateFormat(item.drawTime, "yyyy-MM-dd hh:mm:ss")}</div>
-                    <div class="award">
-                        <span class="text">游戏奖励：</span>
-                        <p>
-                            <span class="diamond-num">${item.reward}</span>
-                            <img src="./images/record/diamond.png" alt="" class="diamond-pic">
-                        </p>
-                    </div>
-                    <ul class="award-animal clearfix">
-                        ${str1}
-                    </ul>
-                    <div class="tip">${text}</div>
-                <li>
-            `
-        })
-        $('.record-list').html(str)
+            <li style="margin-bottom: 0.8rem;">
+                <h3>${dateFormat(res.drawTime, 'yy-MM-dd hh:mm:ss')}</h3>
+                <div class="goldBox">
+                    <span>遊戲獎勵：</span>
+                    <span class="gold">${res.reward}金幣</span>
+                </div>
+                <div class="marine_organism"></div>
+                <p style="display: ${res.drawStatus == 1 ? 'none' : 'block'};" class="fasle">哎呀~猜錯了o(╥﹏╥)o</p>
+                <p style="display: ${res.drawStatus == 1 ? 'block' : 'none'};" class="true">厲害~猜對了୧(๑•̀◡•́๑)૭</p>
+            </li>
+        `
+            results.push(res.results);
+        });
+        $('.record-list').append(str)
+        results.forEach((res, index) => {
+            res.forEach(val => {
+                $('.record-list li').eq(index).children('.marine_organism').append(`<span class='${drawId[index] == val.itemId ? 'active' : ''}'><img src="${val.itemUrl}" alt=""><b>+${val.costPiece}</b></span>`)
+            })
+        });
     }
-    
+
 }
-$(function(){
+$(function () {
     getInfoFromClient()
-    setTimeout(function(){
+    setTimeout(function () {
         getUserRecord()
     }, 50)
     // 监听滚动
-    $('ul').scroll(function(){
+    $('ul').scroll(function () {
         let scrollTop = $(this).scrollTop()
         let scrollHeight = $('ul')[0].scrollHeight
         let ulHeight = $(this).innerHeight()
-        if(scrollTop + ulHeight + 100 >= scrollHeight){
-            if(isLock){
+        if (scrollTop + ulHeight + 100 >= scrollHeight) {
+            if (isLock) {
                 // 请求下一页
-                if(canNext){
+                if (canNext) {
                     getUserRecord(page++)
                     isLock = false
                 }