From 989c70160c86da23fc61ba5516ca56dc6e6dc6d6 Mon Sep 17 00:00:00 2001
From: qf <tanqiaofei@xuanyinyy.com>
Date: Wed, 8 Feb 2023 17:29:35 +0800
Subject: [PATCH] =?UTF-8?q?23=E6=83=85=E4=BA=BA=E8=8A=82=EF=BC=9A=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E5=90=8E=E5=80=BC=E4=B8=8D=E5=88=B7=E6=96=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8Ccp=E5=A5=96=E5=8A=B1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/2023-Valentines-Day/css/index.css   | 13 ++++++++++++-
 .../activity/2023-Valentines-Day/css/index.scss  | 16 ++++++++++++++--
 .../peko/activity/2023-Valentines-Day/index.html |  6 +++---
 .../activity/2023-Valentines-Day/js/index.js     | 12 ++++++++----
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/view/peko/activity/2023-Valentines-Day/css/index.css b/view/peko/activity/2023-Valentines-Day/css/index.css
index 979a7d7..9a562aa 100644
--- a/view/peko/activity/2023-Valentines-Day/css/index.css
+++ b/view/peko/activity/2023-Valentines-Day/css/index.css
@@ -983,7 +983,7 @@ body {
   height: 0.6666666667rem;
 }
 .cpRecordBox .cpRecord_in p {
-  width: 6.5rem;
+  width: 100%;
   height: 0.32rem;
   position: absolute;
   top: 1.9333333333rem;
@@ -998,6 +998,14 @@ body {
   font-size: 0.2933333333rem;
   font-weight: 600;
 }
+.cpRecordBox .cpRecord_in p span:nth-child(1) {
+  width: 2rem;
+  text-align: center;
+}
+.cpRecordBox .cpRecord_in p span:nth-child(4) {
+  width: 2.5rem;
+  text-align: center;
+}
 .cpRecordBox .cpRecord_in ul {
   width: 100%;
   height: 5rem;
@@ -1021,6 +1029,9 @@ body {
   font-size: 0.32rem;
   margin-bottom: 0.2666666667rem;
 }
+.cpRecordBox .cpRecord_in ul li .jiangli {
+  width: 2.5rem;
+}
 .cpRecordBox .cpRecord_in .tips {
   width: 100%;
   text-align: center;
diff --git a/view/peko/activity/2023-Valentines-Day/css/index.scss b/view/peko/activity/2023-Valentines-Day/css/index.scss
index 6ebc711..8e1aa22 100644
--- a/view/peko/activity/2023-Valentines-Day/css/index.scss
+++ b/view/peko/activity/2023-Valentines-Day/css/index.scss
@@ -1128,8 +1128,8 @@ body {
         }
 
         p {
-            width: 6.5rem;
-            // width: 60%;
+            // width: 6.5rem;
+            width: 100%;
             height: px2rem(24, );
             position: absolute;
             top: px2rem(145, );
@@ -1143,6 +1143,14 @@ body {
                 color: #791E40;
                 font-size: px2rem(22, );
                 font-weight: 600;
+                &:nth-child(1){
+                    width: 2rem;
+                    text-align: center;
+                }
+                &:nth-child(4){
+                    width: 2.5rem;
+                    text-align: center;
+                }
             }
         }
 
@@ -1171,6 +1179,10 @@ body {
                     font-size: px2rem(24, );
                     margin-bottom: px2rem(20, );
                 }
+                .jiangli {
+                    width: 2.5rem;
+                    
+                }
             }
         }
 
diff --git a/view/peko/activity/2023-Valentines-Day/index.html b/view/peko/activity/2023-Valentines-Day/index.html
index de7e7c2..617692d 100644
--- a/view/peko/activity/2023-Valentines-Day/index.html
+++ b/view/peko/activity/2023-Valentines-Day/index.html
@@ -281,15 +281,15 @@
             <p>
                 <span>时间</span>
                 <span>我的CP</span>
-                <span>情缘奖励</span>
-                <span>等级</span>
+                <span>情缘等级</span>
+                <span>奖励</span>
             </p>
             <ul class="box">
                 <li>
                     <b>08.31 <e>23:23</e></b>
                     <b>CP1的昵称...</b>
                     <b>缘定今生</b>
-                    <b>XXX座驾1天*1组</b>
+                    <b class="jiangli">XXX座驾1天*1组</b>
                 </li>
             </ul>
             <div class="tips">暫無更多記錄~</div>
diff --git a/view/peko/activity/2023-Valentines-Day/js/index.js b/view/peko/activity/2023-Valentines-Day/js/index.js
index 7427cf1..4847ca4 100644
--- a/view/peko/activity/2023-Valentines-Day/js/index.js
+++ b/view/peko/activity/2023-Valentines-Day/js/index.js
@@ -254,7 +254,7 @@ function cpRewardRecord(cpRecordPage) {
                             <b>${res.dateTime}</b>
                             <b>${res.nick.length > 5 ? res.nick.slice(0, 5) + '...' : res.nick}</b>
                             <b>${res.levelDesc}</b>
-                            <b>${res.rewardDesc}</b>
+                            <b class="jiangli">${res.rewardDesc}</b>
                         </li>
                         `
                     });
@@ -388,7 +388,11 @@ function buy(id, num, type) {
                 } else {
                     if (type == 6) {
                         toastMsg('很遺憾沒有抽到，距離靚號就差一點啦~')
-                    } else {
+                        $('.petition-wrap .myticket span e').html(res.data.prop.remain)
+                    } else if(type == 1,type == 3,type == 4,type == 5){
+                        $('.petition-wrap .myticket span e').html(res.data.prop.remain)
+                    }else{
+                        $('.letter-wrap .letter p e').html(res.data.remain)
                         toastMsg(res.message)
                     }
 
@@ -714,9 +718,9 @@ $('.cpRecordBox .close').click(function () {
     $('.cpRecordBox').hide();
 })
 // cp奖励记录监听滚动
-$('.letter-wrap .cp_record .box').scroll(function () {
+$('.cpRecordBox .cpRecord_in .box').scroll(function () {
     let scrollTop = $(this).scrollTop()
-    let scrollHeight = $('.letter-wrap .cp_record .box')[0].scrollHeight
+    let scrollHeight = $('.cpRecordBox .cpRecord_in .box')[0].scrollHeight
     let ulHeight = $(this).innerHeight()
     if (scrollTop + ulHeight + 100 >= scrollHeight) {
         if (cpRecordScroll) {