From f6eac914482744ec5505109f0035d429aafd5268 Mon Sep 17 00:00:00 2001
From: yuyongdong <yuyongdong@kingsome.cn>
Date: Tue, 20 Aug 2024 16:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=85=85=E5=80=BC=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/confirmDialog.vue |  4 +--
 src/components/assets/assetsHeader.vue   | 35 +++++++++++++++++-------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/components/Dialogs/confirmDialog.vue b/src/components/Dialogs/confirmDialog.vue
index 082f7ce..ab6c0db 100644
--- a/src/components/Dialogs/confirmDialog.vue
+++ b/src/components/Dialogs/confirmDialog.vue
@@ -135,8 +135,8 @@ function hideModal(result = null) {
       background: #fec25d;
       border: 0px;
       font-family: 'Poppins';
-      font-weight: 500;
-      font-size: 14px;
+      font-weight: 700;
+      font-size: 18px;
       color: #2D2738;
       border-radius:30px;
     }
diff --git a/src/components/assets/assetsHeader.vue b/src/components/assets/assetsHeader.vue
index 9df2baa..6bdd05a 100644
--- a/src/components/assets/assetsHeader.vue
+++ b/src/components/assets/assetsHeader.vue
@@ -691,36 +691,51 @@ const rechargeIncrease = async () => {
 
 // 充值
 const conformBtn = async () => {
-  // return
-  // if(localWalletStore.walletType == 3) {
     let address = localWalletStore.address
     if(toRaw(confirmRecharge.value).price == 0) {
       message.error('Please select the amount of bricks to be recharged.')
     } else {
       loadingDialogVisible.value = true
-      // getGameLog()
-      // return
       let goods_num = Number(toRaw(confirmRecharge.value).goods_id) == 1006 ? Number(brickworkAmount.value) : 1
       try {
         const bc = new BlockChain()
         let res = await bc.mall.execBuyItem(Number(toRaw(confirmRecharge.value).goods_id), goods_num,toRaw(confirmRecharge.value).currency_list[0].address)
-        // console.log(res)
         if(res) {
           brickworkAmount.value = 1
           priceAmount.value = 1
           activeIndex.value = 0
           await dataInfo()
           loadingDialogVisible.value = false
-          message.success('Top-Up Successful')
+          // message.success('Top-Up Successful')
+          const confirmResult = await createModal(ConfirmDialog, {
+            title: '',
+            noBtnTitle: '',
+            message: 'Top-Up Successful'
+          }).show()
         }
       } catch(e) {
         console.log(e)
-        if(e.message.indexOf('rejected') > -1) {
-          message.error('Top-Up Cancelled by User')
+        if(e.message.indexOf('rejected') > -1 || e.message.indexOf('reject') > -1) {
+          // message.error('Top-Up Cancelled by User')
+          const confirmResult = await createModal(ConfirmDialog, {
+            title: '',
+            noBtnTitle: '',
+            message: 'Top-Up Cancelled by User'
+          }).show()
         } else if(e.message.indexOf('Error during transaction') > -1) {
-          message.error('Top-Up Failed - Insufficient Balance')
+          // message.error('Top-Up Failed - Insufficient Balance')
+          const confirmResult = await createModal(ConfirmDialog, {
+            title: '',
+            noBtnTitle: '',
+            message: 'Top-Up Failed - Insufficient Balance'
+          }).show()
         } else {
-          message.error('Top-Up fail.')
+          // message.error('Top-Up fail.')
+          const confirmResult = await createModal(ConfirmDialog, {
+            title: '',
+            noBtnTitle: '',
+            message: 'Top-Up fail.'
+          }).show()
         }
         loadingDialogVisible.value = false
       }