From aec6d87ddbed6c5c5169a501379ad2fcf8b0867c Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Thu, 25 Apr 2024 11:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9D=E7=AE=B1=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E9=A1=B5=E5=BC=80=E5=AE=9D=E7=AE=B1=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pagination.vue |  3 +--
 src/views/home/boxBtm.vue     | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/pagination.vue b/src/components/pagination.vue
index 72390a4..de24dfc 100644
--- a/src/components/pagination.vue
+++ b/src/components/pagination.vue
@@ -14,18 +14,17 @@
 <script>
 export default {
   props:{
+    currentPage: Number,
     total: Number,
   },
   data() {
     return {
       pageSize: 6,
-      currentPage: 1,
     }
   },
   mounted() {},
   methods: {
     handleCurrentChange(val) {
-      this.currentPage = val
       this.$emit("onChangePage", val);
     },
   },
diff --git a/src/views/home/boxBtm.vue b/src/views/home/boxBtm.vue
index 357b54b..f3071af 100644
--- a/src/views/home/boxBtm.vue
+++ b/src/views/home/boxBtm.vue
@@ -166,7 +166,7 @@
           </li>
         </div>
         <div class="box-pagination" v-if="boxList.length > 6">
-          <Pagination @onChangePage="onChangePage" :total="boxList.length" />
+          <Pagination @onChangePage="onChangePage" :currentPage="currentPage" :total="boxList.length" />
         </div>
       </div>
     </div>
@@ -207,7 +207,8 @@
                   <img src="./../../assets/common/Icon_Points.png" alt />
                 </div>
                 <div v-if="row.items !== undefined && row.items.length > 0">
-                  <span>{{ row.items[0].name }}</span>
+                  <span v-if="row.items[0].name == 'NFT'">Founder's Tag</span>
+                  <span v-else>{{ row.items[0].name }}</span>
                   <img v-if="row.items[0].name == 'NFT'" src="./../../assets/common/common_icon_NFT.png" alt />
                   <img v-else src="./../../assets/common/wallet-yes.png" alt />
                 </div>
@@ -407,6 +408,7 @@ export default {
     // 分页
     onChangePage(val) {
       this.currentPage = val;
+      this.getMyBoxList()
     },
 
     // 修改中间宝箱数据
@@ -457,11 +459,14 @@ export default {
             }
           } else {
             // alert(`领取成功,显示奖励: ${JSON.stringify(data)}`)
+            if(this.currentPageItems.length == 1) {
+              if(this.currentPage > 1) {
+                this.onChangePage(this.currentPage-1)
+              }
+            }
             this.boostingList = [];
-            this.currentPageItems = []
-            this.getMyBoxList();
+            this.getMyBoxList()
             this.openBoxLog();
-            console.log('currentPageItems',this.currentPageItems)
             this.isLoading = false;
             this.$emit("awardDialog", data);
             localStorage.removeItem(storeageKey);
@@ -1125,7 +1130,7 @@ export default {
                       img {
                         width: 10px;
                         height: 14px;
-                        margin-left: 10px;
+                        margin-left: 5px;
                         margin-top: 2px;
                       }
                       div {
@@ -1134,14 +1139,14 @@ export default {
                         text-align: right;
                       }
                       div:nth-child(2) {
-                        width: 105px;
-                        margin-left: 20px;
+                        width: 140px;
+                        margin-left: 10px;
                         font-size: 14px;
                         display: flex;
                         align-items: center;
                         img {
                           width: 20px;
-                          height: 15px;
+                          height: 20px;
                         }
                       }
                     }