Merge branch 'dev_1.1.0' of https://git.yishihui.com/DeNet/de-net into dev_1.1.0

src/logic/content/ParseCard.js

@@ -243,6 +243,7 @@ class ParseCard {
         return _iframe
     }
     createNftIframe({project_Id}) {
+        project_Id = project_Id.replace('?', '&');
         let _iframe = document.createElement('iframe')
             _iframe.id = project_Id
             _iframe.src = chrome.runtime.getURL('/iframe/nft-card.html') + `?projectId=${project_Id}`;

src/logic/content/twitter.js

@@ -107,8 +107,7 @@ export function twitterPublishHandler(res) {
     nextTick(() => {
         document.execCommand('selectAll');
     }, 100).then(() => {
-        document.execCommand('delete');
-        _setPublishContent(res.srcContent, 200);
+        _setPublishContent(res.srcContent, 500);
     })
 }
 

src/view/iframe/nft/card.vue

@@ -80,11 +80,20 @@ const getSaleProjectInfo = (account) => {
 }
 
 const share = () => {
-    let url = pageUrl + `/nft/${saleData.value.nftProjectId}`
-    let content = `#DNFT\r${url}`
     chrome.tabs.getCurrent((tab) => {
-        chrome.tabs.sendMessage(tab.id, { actionType: "IFRAME_TWITTER_PUBLISH", publishRes: { srcContent: content }  });
-    })
+        let tagUrl = new URL(tab.url);
+        let tagPathName = tagUrl.pathname.slice(1);
+        let tagSearch = ``;
+        if (tagPathName) {
+            let tagArr = tagPathName.split('/');
+            tagSearch = `?twitterAccount=${btoa(tagArr[0])}`
+        }
+        let url = pageUrl + `/nft/${saleData.value.nftProjectId}${tagSearch}`
+        let content = `#DNFT\r\r${url}`
+        chrome.tabs.getCurrent((tab) => {
+            chrome.tabs.sendMessage(tab.id, { actionType: "IFRAME_TWITTER_PUBLISH", publishRes: { srcContent: content }  });
+        });
+    });
 }
 
 const buy = () => {