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

src/logic/content/twitter.js

@@ -1438,8 +1438,9 @@ const initGroupTip = () => {
 
 export const showGroupTip = () => {
     let dom_denet_group_tip = document.querySelector('#denet_group_tip')
-    dom_denet_group_tip.style.display = 'block'
+    dom_denet_group_tip.style.display = 'block';
 
+    groupBtnStyleChange();
 }
 
 export const hideBuyNFT = () => {
@@ -1749,6 +1750,22 @@ const createGroupTabNode = () => {
     return groupTab;
 }
 
+const groupBtnStyleChange = () => {
+    let tab = getGroupTabNode();
+    if(tab) {
+        let line = tab.querySelector('#de-tab-line');
+        if(line) {
+            let {display} = line.style;
+            if(display != 'none') {
+                chrome.runtime.sendMessage({
+                    actionType: "SWITCH_GROUP_BANNER_STATUS",
+                    data: { type: 'btn' }
+                }, () => { });
+            }
+        }
+    } 
+}
+
 const getGroupTabNode = () => {
     let tab = document.querySelector('#de-nav-tab-group');
     return tab;
@@ -1976,11 +1993,11 @@ const setGroupTabSelfStyle = (params = {}) => {
     if (groupTab) {
         groupTab.style.color = groupColor;
         groupTab.style.fontWeight = groupFontWeight;
-    }
 
-    let lineDom = groupTab.querySelector('#de-tab-line');
-    if (lineDom) {
-        lineDom.style.display = lineDisplay;
+        let lineDom = groupTab.querySelector('#de-tab-line');
+        if (lineDom) {
+            lineDom.style.display = lineDisplay;
+        }
     }
 };
 

src/view/iframe/tab-group/tab-group.vue

@@ -23,17 +23,17 @@
                                         padding: 20px;
                                         box-sizing: border-box;">
                                     <template #reference>
-                                        <img :src="item.nftItem.imagePath" class="icon-nft" @click.stop="">
+                                        <img v-if="item.nftItem" :src="item.nftItem.imagePath" class="icon-nft" @click.stop="">
                                     </template>
                                     <template #default>
-                                        <div class="preview-nft">
+                                        <div class="preview-nft" v-if="item.nftItem">
                                             <img :src="item.nftItem.imagePath" class="icon-nft-big">
                                             <div class="content">
                                                 <div class="nft-name">
                                                     {{item.nftItem.nftItemName}} 
                                                 </div>
                                                 <div class="nft-desc">
-                                                    <div v-html="item.nftItem.metadata.description"></div>
+                                                    <div v-if="item.nftItem.metadata" v-html="item.nftItem.metadata.description"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -186,9 +186,12 @@ const getListData = () => {
             let resData = res.data;
             if (resData.length) {
                 for (let i = 0; i < resData.length; i++) {
-                    let matedata = resData[i]["nftItem"]['metadata'];
-                    if(matedata) {
-                        resData[i]["nftItem"]['metadata'] = JSON.parse(matedata);
+                    let nftItem = resData[i]["nftItem"];
+                    if(nftItem) {
+                        let matedata = nftItem['metadata'];
+                        if(matedata) {
+                            resData[i]["nftItem"]['metadata'] = JSON.parse(matedata);
+                        }
                     }
                 }
 
@@ -275,20 +278,6 @@ html, body, #app {
     .post-content {
         color: #fff !important;
     }
-
-    .preview-nft {
-        color: #fff !important;
-        .content {
-            color: #fff !important;
-
-            .nft-name {
-                color: #fff !important;
-            }
-            .nft-desc {
-                color: #fff !important;
-            }
-        }
-    }
 }
 
 .preview-nft {