Merge branch 'test_1.1.8' of https://git.yishihui.com/DeNet/de-net-hotload into test_1.1.8

src/components/popup-transactions.vue

@@ -310,7 +310,9 @@ const getTransactionsList = () => {
 
 onMounted(() => {
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_RUNTIME_CONNECT_POPUP,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_RUNTIME_CONNECT_POPUP
+        },
         data: {}
     });
     setTimeout(() => {
@@ -336,12 +338,16 @@ const setMessageCount = () => {
             if (unReadCountTotal > 0) {
                 let text = unReadCountTotal > 99 ? '99+' : unReadCountTotal + '';
                 messageCenter.send({
-                    actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_SETBADGEINFO,
+                    info: {
+                        actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_SETBADGEINFO
+                    },
                     data: { text }
                 })
             } else {
                 messageCenter.send({
-                    actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_HIDEBADGE,
+                    info: {
+                        actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_HIDEBADGE
+                    },
                     data: {}
                 })
             }

src/components/v-head.vue

@@ -15,7 +15,7 @@
             <img :src="require('@/assets/svg/icon-back-head-list.svg')"
                 v-if="show_list" 
                 class="list" 
-                @click="clickList" />
+                @click="showTransactions" />
             <img :src="require('@/assets/svg/icon-refresh.svg')" alt="" class="refresh" v-if="show_refresh"
                 @click="clickRefresh" :class="{ transform_rotate: state.rotate }">
             <img :src="require('@/assets/svg/icon-head-help.svg')" alt="" class="help" v-if="props.show_help"
@@ -24,7 +24,7 @@
                 @click="state.show_option = true">
             <div class="area-option" v-if="state.show_option" @click="state.show_option = false">
                 <div class="option">
-                    <div class="item" @click="clickItem('/transactions')">
+                    <div class="item" @click="showTransactions">
                         <img :src="require('@/assets/svg/icon-menu.svg')" alt="">
                         <span>Transactions History</span>
                     </div>
@@ -36,6 +36,8 @@
 <script setup>
 import { defineProps, defineEmits, reactive, ref } from "vue";
 import { useRouter } from "vue-router";
+import messageCenter from "@/uilts/messageCenter";
+import MESSAGE_ENUM from "@/uilts/messageCenter/messageEnum";
 
 let props = defineProps({
     title: String,
@@ -79,10 +81,10 @@ function clickRefresh() {
     }, 1000)
 }
 
-function clickItem(path) {
+function showTransactions() {
     let params = props.transactionsRouterParams || {};
     router.push({
-        path: path,
+        name: 'navWalletTransactions',
         query: {
             params: JSON.stringify(params)
         }
@@ -93,17 +95,6 @@ function clickHelp() {
     window.open(`https://aboard-cattle-610.notion.site/How-to-withdraw-assets-from-DeNet-to-MetaMask-01c679bb9ff441429e31e8f7c1f67411`)
 }
 
-function clickList() {
-    let params = props.transactionsRouterParams || {};
-    console.log('transactionsRouterParams',params);
-    router.push({
-        path: '/transactions',
-        query: {
-            params: JSON.stringify(params)
-        }
-    })
-}
-
 </script>
 <style lang="scss" scoped>
 .border {

src/pages/currency/detail.vue

@@ -66,7 +66,7 @@ import { ref, onMounted, inject, onBeforeUnmount } from "vue";
 import { useRouter } from 'vue-router';
 import Report from "@/log-center/log";
 import { getCurrencyInfoBySymbol, syncChainTokenRechargeRecord } from "@/http/publishApi";
-import { setChromeStoragetoExtension, chromeExtensionUrl } from "@/uilts/chromeExtension"
+import { setChromeStoragetoExtension } from "@/uilts/chromeExtension"
 import messageCenter from "@/uilts/messageCenter";
 import MESSAGE_ENUM from "@/uilts/messageCenter/messageEnum";
 import VHead from '@/components/v-head.vue'
@@ -114,7 +114,6 @@ const selectCurrency = (params) => {
     }
 }
 
-let withdraw_info = inject('withdraw_info')
 // 点击提现
 const clickWithdraw = () => {
     Report.reportLog({
@@ -132,24 +131,15 @@ const clickWithdraw = () => {
 }
 
 const withdrawHandle = (_params) => {
-    withdraw_info.chainInfo = _params.chainInfo;
-    withdraw_info.source = 'home'
-    withdraw_info.balance = _params.balance
-    withdraw_info.token_symbol = _params.tokenSymbol || ''
-    withdraw_info.currency_name = _params.currencyName || ''
-    withdraw_info.token_chain = _params.tokenChain || ''
-    withdraw_info.currency_code = _params.currencyCode
-    withdraw_info.icon_token = _params.iconPath || ''
-    withdraw_info.icon_net = require('@/assets/svg/icon-BNB.svg')
-
-    if (_params.currencyCode == 'USD') {
-        withdraw_info.currency_code = _params.currencyCode
-        withdraw_info.paypal.amount_value = _params.balance
-        router.push('/withdraw/paypal')
-    } else {
-        console.log(withdraw_info.chainInfo.iconPath)
-        router.push('/withdraw/info')
-    }
+    messageCenter.send({
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_WITHDRAW,
+            iframeId: iframeId,
+        },
+        data: {
+            params: _params
+        }
+    })
 }
 
 let top_up_info = inject('top_up_info');
@@ -244,24 +234,19 @@ const showSendGiveawayDialog = (params = {}) => {
         showCurrencySelect.value = true;
         currencyOpertionType = "SEND";
     } else {
-        setLocalSelectCurrencyInfo(params)
-        setTimeout(() => {
-            messageCenter.send({
-                info: {
-                    actionType: MESSAGE_ENUM.POPUP_SHOW_DENET_PUBLISH_DIALOG,
-                    iframeId: iframeId
-                },
-                data: {}
-            })
-        }, 600)
+        messageCenter.send({
+            info: {
+                actionType: MESSAGE_ENUM.POPUP_SHOW_DENET_PUBLISH_DIALOG,
+                iframeId: iframeId
+            },
+            data: {
+                params
+            }
+        })
         currencyOpertionType = '';
     }
 };
 
-const setLocalSelectCurrencyInfo = (params = {}) => {
-    setChromeStoragetoExtension({ selectCurrencyInfo: JSON.stringify(params) })
-}
-
 const cancelDeposit = () => {
     showDepositInput.value = false;
 }
@@ -274,23 +259,15 @@ const confirmDeposit = () => {
     showDepositInput.value = false;
     depositDesc.value = '';
 
-    let achPayInfo = {
-        amountValue: finalAmountData.value.finalAmountValue
-    };
-    let guideUrl = chromeExtensionUrl + ('iframe/ach-cashier.html');
-    setChromeStoragetoExtension({ achPayInfo: JSON.stringify(achPayInfo) });
-    let str = window.location.hash + '&refresh=true';
-    let path = str.substring(1, str.length);
-    setChromeStoragetoExtension({
-        achPayData: JSON.stringify({
-            form: 'popupPage',
-            path
-        })
-    });
-
-    chrome.tabs.create({
-        url: guideUrl
-    });
+    messageCenter.send({
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_ACH_PAYMENT,
+            iframeId: iframeId,
+        },
+        data: {
+            amountValue: finalAmountData.value.finalAmountValue,
+        }
+    })
 }
 
 const onDepositAmountInput = async (params = {}) => {

src/pages/tabbar/nft/detail.vue

@@ -111,7 +111,9 @@ let NFTInfo = ref({
 
 const back = () => {
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        },
         data: {
             showMenu: true,
         }
@@ -362,13 +364,14 @@ onMounted(() => {
         background: #ffffff;
         box-shadow: inset 0px 1px 0px #ececec;
         height: 70px;
-        padding: 0 16px;
         box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: right;
-
+        position: relative;
         .sale {
+            position: absolute;
+            right: 16px;
             display: flex;
             align-items: center;
             justify-content: center;

src/pages/tabbar/nft/transfer.vue

@@ -122,7 +122,9 @@ const next = () => {
 
 const doneHandle = () => {
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU
+        },
         data: {
             showMenu: true,
         }

src/pages/tabbar/wallet/transactions.vue

@@ -27,12 +27,16 @@ onMounted(() => {
 })
 
 const clickBack = () => {
-    messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
-        data: {
-            showMenu: true,
-        }
-    })
+    if (back_url.value !== '') {
+        messageCenter.send({
+            info: {
+                actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU
+            },
+            data: {
+                showMenu: true,
+            }
+        })
+    }
 }
 </script>
 

src/uilts/messageCenter/messageEnum.js

@@ -26,6 +26,9 @@ const SEND_MESSAGE_ENUM =  {
 
     // ---- 获取twitter用户信息 ----
     IFRAME_GET_TWITTER_USER_INFO: 'IFRAME_GET_TWITTER_USER_INFO',
+    // ---- ACH支付 ----
+    IFRAME_ACH_PAYMENT: 'IFRAME_ACH_PAYMENT',
+    IFRAME_WITHDRAW: 'IFRAME_WITHDRAW',
 }
 
 /** 接收父窗口的事件定义 */