From 4b0993dee3463a734481fed2db2414e101d07c07 Mon Sep 17 00:00:00 2001
From: Dragon <13925835632@139.com>
Date: Sun, 4 Feb 2024 11:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E9=A1=B5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yinmeng/activity/2024-lover/css/index.css |  3 +-
 .../activity/2024-lover/css/index.scss        |  3 +-
 view/yinmeng/activity/2024-lover/index.html   | 72 ++++++++++---------
 view/yinmeng/activity/2024-lover/js/index.js  | 24 +++++--
 4 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/view/yinmeng/activity/2024-lover/css/index.css b/view/yinmeng/activity/2024-lover/css/index.css
index 272a1bb..e6e1b21 100644
--- a/view/yinmeng/activity/2024-lover/css/index.css
+++ b/view/yinmeng/activity/2024-lover/css/index.css
@@ -1363,7 +1363,8 @@ body {
   position: fixed;
   width: 10rem;
   height: 2.2rem;
-  left: 0;
+  left: 50%;
+  transform: translateX(-50%);
   bottom: 0rem;
   z-index: 99;
   background: url(../images/myBg2.png) no-repeat;
diff --git a/view/yinmeng/activity/2024-lover/css/index.scss b/view/yinmeng/activity/2024-lover/css/index.scss
index 2174900..6da440f 100644
--- a/view/yinmeng/activity/2024-lover/css/index.scss
+++ b/view/yinmeng/activity/2024-lover/css/index.scss
@@ -1393,7 +1393,8 @@ body {
         width: px2rem(750);
         height: 2.2rem;
         // height: 8.74667rem;
-        left: 0;
+        left: 50%;
+        transform: translateX(-50%);
         bottom: 0rem;
         z-index: 99;
         background: url(../images/myBg2.png) no-repeat;
diff --git a/view/yinmeng/activity/2024-lover/index.html b/view/yinmeng/activity/2024-lover/index.html
index 84e3980..410a60f 100644
--- a/view/yinmeng/activity/2024-lover/index.html
+++ b/view/yinmeng/activity/2024-lover/index.html
@@ -42,41 +42,43 @@
             <!-- 铭牌 -->
             <img src="./images/mp.png" alt="" class="mp">
             <!-- 点亮列表 -->
-            <div class="giftList giftList1 filter">
-                <div class="qp"></div>
-                <img src="./images/1.png" alt="" class="gift">
-                <div class="giftName">白玫瑰</div>
-                <div class="giftVAlue">1314钻</div>
-            </div>
-            <div class="giftList giftList2 filter">
-                <div class="qp"></div>
-                <img src="./images/2.png" alt="" class="gift">
-                <div class="giftName">红玫瑰</div>
-                <div class="giftVAlue">1314钻</div>
-            </div>
-            <div class="giftList giftList3 filter">
-                <div class="qp"></div>
-                <img src="./images/3.png" alt="" class="gift">
-                <div class="giftName">粉玫瑰</div>
-                <div class="giftVAlue">1314钻</div>
-            </div>
-            <div class="giftList giftList4 filter">
-                <div class="qp"></div>
-                <img src="./images/4.png" alt="" class="gift">
-                <div class="giftName">彩玫瑰</div>
-                <div class="giftVAlue">1314钻</div>
-            </div>
-            <div class="giftList giftList5 filter">
-                <div class="qp"></div>
-                <img src="./images/5.png" alt="" class="gift">
-                <div class="giftName">炽热爱恋</div>
-                <div class="giftVAlue">1314钻</div>
-            </div>
-            <div class="giftList giftList6 filter">
-                <div class="qp"></div>
-                <img src="./images/6.png" alt="" class="gift">
-                <div class="giftName">纯白爱恋</div>
-                <div class="giftVAlue">1314钻</div>
+            <div class="giftListBox">
+                <div class="giftList giftList1 filter">
+                    <div class="qp"></div>
+                    <img src="./images/1.png" alt="" class="gift">
+                    <div class="giftName">白玫瑰</div>
+                    <div class="giftVAlue">1314钻</div>
+                </div>
+                <div class="giftList giftList2 filter">
+                    <div class="qp"></div>
+                    <img src="./images/2.png" alt="" class="gift">
+                    <div class="giftName">红玫瑰</div>
+                    <div class="giftVAlue">1314钻</div>
+                </div>
+                <div class="giftList giftList3 filter">
+                    <div class="qp"></div>
+                    <img src="./images/3.png" alt="" class="gift">
+                    <div class="giftName">粉玫瑰</div>
+                    <div class="giftVAlue">1314钻</div>
+                </div>
+                <div class="giftList giftList4 filter">
+                    <div class="qp"></div>
+                    <img src="./images/4.png" alt="" class="gift">
+                    <div class="giftName">彩玫瑰</div>
+                    <div class="giftVAlue">1314钻</div>
+                </div>
+                <div class="giftList giftList5 filter">
+                    <div class="qp"></div>
+                    <img src="./images/5.png" alt="" class="gift">
+                    <div class="giftName">炽热爱恋</div>
+                    <div class="giftVAlue">1314钻</div>
+                </div>
+                <div class="giftList giftList6 filter">
+                    <div class="qp"></div>
+                    <img src="./images/6.png" alt="" class="gift">
+                    <div class="giftName">纯白爱恋</div>
+                    <div class="giftVAlue">1314钻</div>
+                </div>
             </div>
         </div>
 
diff --git a/view/yinmeng/activity/2024-lover/js/index.js b/view/yinmeng/activity/2024-lover/js/index.js
index 014c7bb..011029e 100644
--- a/view/yinmeng/activity/2024-lover/js/index.js
+++ b/view/yinmeng/activity/2024-lover/js/index.js
@@ -47,18 +47,32 @@ $(function () {
                 window.webkit.messageHandlers.closeWebView.postMessage(null)
             }
         })
-
+        getTask();
     }, 100)
 })
-// 接口
-function get () {
+// 获取任务接口
+function getTask () {
     showLoading()
     networkRequest({
         type: 'get',
-        url: urlPrefix + '',
-        data: { type: taskType },
+        url: urlPrefix + '/activity/task/user',
+        data: { componentCode: 1 },
         success (res) {
             if (res.code === 200) {
+                // 渲染合成列表
+                $('.page1 .bg1 .giftListBox .giftList').remove();
+                var str = '';
+                res.data.forEach((res, i) => {
+                    str += `
+                    <div class="giftList giftList${i + 1} ${res.completed ? '' : 'filter'}">
+                        <div class="qp"></div>
+                        <img src="${res.taskIcon}" alt="" class="gift">
+                        <div class="giftName">${res.taskName}</div>
+                        <div class="giftVAlue">${res.showValue}钻</div>
+                    </div>
+                    `
+                });
+                $('.page1 .bg1 .giftListBox').append(str);
             } else {
                 toastMsg(res.message)
             }