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

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 { setChromeStorage, chromeExtensionUrl } from "@/uilts/chromeExtension"
+import { setChromeStoragetoExtension, chromeExtensionUrl } from "@/uilts/chromeExtension"
 import messageCenter from "@/uilts/messageCenter";
 import MESSAGE_ENUM from "@/uilts/messageCenter/messageEnum";
 import VHead from '@/components/v-head.vue'
@@ -90,6 +90,7 @@ let showDepositInput = ref(false);
 let reqCalcIng = false;
 let depositDesc = ref('');
 let finalAmountData = ref({});
+let iframeId = 'de-nav-wallet-index-page';
 
 const selectCurrency = (params) => {
     showCurrencySelect.value = false;
@@ -245,17 +246,20 @@ const showSendGiveawayDialog = (params = {}) => {
     } else {
         setLocalSelectCurrencyInfo(params)
         setTimeout(() => {
-            // chrome.runtime.sendMessage({
-            //     actionType: "POPUP_SHOW_DENET_PUBLISH_DIALOG",
-            //     data: {}
-            // });
+            messageCenter.send({
+                info: {
+                    actionType: MESSAGE_ENUM.POPUP_SHOW_DENET_PUBLISH_DIALOG,
+                    iframeId: iframeId
+                },
+                data: {}
+            })
         }, 600)
         currencyOpertionType = '';
     }
 };
 
 const setLocalSelectCurrencyInfo = (params = {}) => {
-    setChromeStorage({ selectCurrencyInfo: JSON.stringify(params) })
+    setChromeStoragetoExtension({ selectCurrencyInfo: JSON.stringify(params) })
 }
 
 const cancelDeposit = () => {
@@ -274,10 +278,10 @@ const confirmDeposit = () => {
         amountValue: finalAmountData.value.finalAmountValue
     };
     let guideUrl = chromeExtensionUrl + ('iframe/ach-cashier.html');
-    setChromeStorage({ achPayInfo: JSON.stringify(achPayInfo) });
+    setChromeStoragetoExtension({ achPayInfo: JSON.stringify(achPayInfo) });
     let str = window.location.hash + '&refresh=true';
     let path = str.substring(1, str.length);
-    setChromeStorage({
+    setChromeStoragetoExtension({
         achPayData: JSON.stringify({
             form: 'popupPage',
             path
@@ -316,7 +320,10 @@ const onDepositAmountInput = async (params = {}) => {
 
 const clickBack = () => {
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+            iframeId: iframeId
+        },
         data: {
             showMenu: true,
         }

src/pages/tabbar/message/index.vue

@@ -325,6 +325,7 @@ let giveReqParams = {
 };
 
 let isReadMsg = ref(true);
+let iframeId = 'de-nav-message-page';
 
 /**
  * 获取红包列表
@@ -334,7 +335,10 @@ const getLuckdropRecordsList = () => {
     params: giveReqParams.params,
   }).then((res) => {
     messageCenter.send({
-      actionType: MESSAGE_ENUM.IFRAME_RUNTIME_CONNECT_POPUP,
+      info: {
+        actionType: MESSAGE_ENUM.IFRAME_RUNTIME_CONNECT_POPUP,
+        iframeId: iframeId,
+      },
       data: {}
     })
     if (res.data && res.data.length) {
@@ -381,7 +385,10 @@ const clickListItem = (params) => {
 
   let url = twitterUrl + nickName + "/status/" + params.srcContentId;
   messageCenter.send({
-    actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_CREATE_TAB,
+    info: {
+      actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_CREATE_TAB,
+      iframeId: iframeId,
+    },
     data: {
       url
     }
@@ -410,7 +417,10 @@ const pageScroll = (e) => {
  */
 const sendTwitter = (params) => {
   messageCenter.send({
-    actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_PUBLISH_TWITTER,
+    info: {
+      actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_PUBLISH_TWITTER,
+      iframeId: iframeId,
+    },
     data: {
       srcContent: params.postTaskLuckdrop.srcContent,
       postId: params.postTaskLuckdrop.postId,
@@ -487,12 +497,18 @@ 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,
+            iframeId: iframeId,
+          },
           data: { text }
         })
       } else {
         messageCenter.send({
-          actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_HIDEBADGE,
+          info: {
+            actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_HIDEBADGE,
+            iframeId: iframeId,
+          },
           data: {}
         })
       }

src/pages/tabbar/nft/index.vue

@@ -37,11 +37,15 @@ let pageWrapperDom = ref(null);
 let pageListDom = ref(null);
 let joinGroupFinishShow = ref(false);
 let router = useRouter()
+let iframeId = 'de-nav-nft-index-page';
 
 const clickNFT = (params) => {
     console.log(params)
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+            iframeId: iframeId,
+        },
         data: {
             showMenu: false,
         }

src/pages/tabbar/wallet/index.vue

@@ -57,13 +57,17 @@ let isRequestWithdrawBalance = ref(false);
 let router = useRouter()
 let currencyListDom = ref('');
 let iconRotate = ref(false)
+let iframeId = 'de-nav-wallet-index-page';
 
 // 钱包未读数
 let unReadCountWallet = ref(0);
 
 function selectCurrency(_params) {
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+            iframeId: iframeId
+        },
         data: {
             showMenu: false,
         }
@@ -109,12 +113,18 @@ 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,
+                        iframeId: iframeId
+                    },
                     data: { text }
                 })
             } else {
                 messageCenter.send({
-                    actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_HIDEBADGE,
+                    info: {
+                        actionType: MESSAGE_ENUM.IFRAME_MESSAGE_PAGE_HIDEBADGE,
+                        iframeId: iframeId
+                    },
                     data: {}
                 })
             }
@@ -159,7 +169,10 @@ const checkLoginState = (cb) => {
 
 const showTransactions = () => {
     messageCenter.send({
-        actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+        info: {
+            actionType: MESSAGE_ENUM.IFRAME_SHOW_FOOTER_MENU,
+            iframeId: iframeId
+        },
         data: {
             showMenu: false,
         }

src/uilts/messageCenter/messageEnum.js

@@ -13,6 +13,7 @@ const SEND_MESSAGE_ENUM =  {
     IFRAME_MESSAGE_PAGE_HIDEBADGE: 'IFRAME_MESSAGE_PAGE_HIDEBADGE',
     IFRAME_RUNTIME_CONNECT_POPUP: 'IFRAME_RUNTIME_CONNECT_POPUP',
     IFRAME_SHOW_FOOTER_MENU: 'IFRAME_SHOW_FOOTER_MENU',
+    POPUP_SHOW_DENET_PUBLISH_DIALOG: 'POPUP_SHOW_DENET_PUBLISH_DIALOG',
 }
 
 /** 接收父窗口的事件定义 */