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

src/entry/background.js

@@ -25,8 +25,7 @@ import {
     checkShowPublishDialog
 } from "@/logic/background/twitter";
 import Report from "@/log-center/log"
-import { PingPong, httpNetWork } from "@/logic/background/help";
-import { commonFetch } from '@/http/fetch'
+import { PingPong, httpNetWork, httpContentToBack } from "@/logic/background/help";
 import { appVersionCode } from '@/http/configAPI.js'
 import { getChromeStorage, setChromeStorage } from '@/uilts/chromeExtension.js'
 
@@ -190,13 +189,7 @@ function onMessageMethod(req, sender, sendResponse) {
                     httpNetWork(req.funcName, req.data, sender)
                     break
                 case 'HTTP_CONTENT_TO_BACK':
-                    commonFetch(req.data)
-                    .then((response) => {
-                        chrome.tabs.sendMessage(sender.tab.id, { actionType: 'HTTP_BACK_TO_CONTENT', data: response, callback_id: req.callback_id });
-                    })
-                    .catch(() => {
-                        chrome.tabs.sendMessage(sender.tab.id, { actionType: 'HTTP_BACK_TO_CONTENT', data: null, callback_id: req.callback_id });
-                    })
+                    httpContentToBack(req, sender)
                     break
                 case 'CONTENT_TWITTER_SHORT_LINK':
                     req.arr_url.forEach(item => {

src/entry/content.js

@@ -148,7 +148,6 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
             setPopupConfByPopupPage();
             break
         case 'IFREME_TAB_GROUP_SET_IFRAME_HEIGHT':
-            console.log('IFREME_TAB_GROUP_SET_IFRAME_HEIGHT', req)
             setTabGroupIframeStyle(req.data);
             break
         case 'IFREME_TAB_GROUP_CONTENT_GET_NAV_TOP':

src/http/configAPI.js

@@ -1,4 +1,4 @@
-export const appVersionCode = 14
+export const appVersionCode = 15
 
 const api = {
 	production: 'https://api.denetme.net',

src/logic/background/fetch/twitter.js

@@ -125,4 +125,5 @@ export async function fetchGetAllUnReadNotices(params = {}) {
         url: '/notice/getAllUnReadNotices',
         params
     })
-}
+}
+

src/logic/background/help.js

@@ -27,9 +27,19 @@ export const setContentMessage = (obj) => {
     chrome.tabs.query({}, (tabs = []) => {
         if (tabs.length) {
             tabs = tabs.filter((item) => { return item.active && item.selected && item.highlighted }) || []
-            tabs.forEach((item)=>{
+            tabs.forEach((item) => {
                 chrome.tabs.sendMessage(item.id, obj);
             })
         }
     })
+}
+
+export const httpContentToBack = (req, sender) => {
+    commonFetch(req.data)
+        .then((response) => {
+            chrome.tabs.sendMessage(sender.tab.id, { actionType: 'HTTP_BACK_TO_CONTENT', data: response, callback_id: req.callback_id });
+        })
+        .catch(() => {
+            chrome.tabs.sendMessage(sender.tab.id, { actionType: 'HTTP_BACK_TO_CONTENT', data: null, callback_id: req.callback_id });
+        })
 }

src/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "DeNet",
     "description": "Growing more twitter followers with Denet",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "background": {
         "service_worker": "/js/background.js"
     },

src/uilts/chromeExtension.js

@@ -1,6 +1,7 @@
 import { pageUrl } from "@/http/configAPI.js"
 import { exp } from "mathjs"
 import { guid } from "@/uilts/help";
+import { consoleSandbox } from "_@sentry_utils@7.5.1@@sentry/utils";
 export const LANDING_PAGE = {
     name: 'received_log',
     url: pageUrl
@@ -12,10 +13,14 @@ export const LANDING_PAGE_MID = {
 }
 
 export function setChromeStorage(params, callback) {
-    if (callback) {
-        chrome.storage.local.set(params, callback)
-    } else {
-        chrome.storage.local.set(params)
+    try {
+        if (callback) {
+            chrome.storage.local.set(params, callback)
+        } else {
+            chrome.storage.local.set(params)
+        }
+    } catch (error) {
+        console.error(error)
     }
 }
 
@@ -44,6 +49,13 @@ export function getChromeStorage(key = '', callback) {
     });
 }
 
+// export function chromeSendMessage() {
+//     try {
+//         // chrome.runtime.sendMessage
+//     } catch {
+//     }
+// }
+
 export function setChromeCookie({
     name,
     url
@@ -56,53 +68,22 @@ export function setChromeCookie({
     })
 }
 
-export function getChromeCookie({
-    name,
-    url
-}, callback) {
-    chrome.cookies.getAll(
-        {
-            name: name || '',
-            url: url || ''
-        }, (e = []) => {
-            let _str = '[]'
-            if (e.length > 0) {
-                _str = e[0].value
-            }
-            let _arr = JSON.parse(decodeURIComponent(_str)) || []
-            callback(_arr)
-        }
-    )
-}
-
-// 累加ChromeCookie
-export function concatChromeCookie({ name, url }, value_obj) {
-    chrome.cookies.getAll(
-        {
-            name: name || '',
-            url: url || ''
-        }, (e = []) => {
-            let _str = '[]'
-            if (e.length > 0) {
-                _str = e[0].value
+export function getChromeCookie({ name = '', url = '' }, callback) {
+    try {
+        chrome.cookies.getAll({ name, url }, (res = []) => {
+            let _str = ''
+            if (Array.isArray(res) && res.length) {
+                _str = res[0].value
             }
-            let _arr = JSON.parse(decodeURIComponent(_str)) || []
-            _arr = _arr.concat(value_obj)
-
-            // 删除cookies
-            chrome.cookies.remove(LANDING_PAGE, () => {
-                chrome.cookies.set({
-                    expirationDate: new Date().getTime() / 10,
-                    name: name,
-                    url: url,
-                    value: encodeURIComponent(JSON.stringify(_arr)) || ''
-                }, (e) => {
-                    console.log(e)
-                })
+            if (_str) {
+                callback(JSON.parse(decodeURIComponent(_str)))
+            } else {
+                callback(null)
             }
-            )
-        }
-    )
+        })
+    } catch (error) {
+        console.error('catch',error)
+    }
 }
 
 export function removeChromeCookie(params, cb) {

src/view/components/component-zoom.vue

@@ -19,13 +19,11 @@ let props = defineProps({
 })
 
 let zoom = ref(1);
-let currentInstance
+let currentInstance;
 
 const setFontZoom = () => {
     const currentInstance = getCurrentInstance()
     let offsetWidth = currentInstance.ctx.$refs.zoomDom.offsetWidth;
-    console.log('currentInstance', currentInstance)
-    console.log('offsetWidth', offsetWidth)
     zoom.value = offsetWidth > props.width ? +props.width / offsetWidth : 1
 }
 

src/view/components/currency-select.vue

@@ -2,12 +2,12 @@
 <template>
     <div class="list-item" v-for="(item, index) in props.list" :key="index">
         <div class="item-title">
-            <img class="icon" :src="item.chainInfo.iconPath" />
-            {{item.chainInfo.chainName}}
+            <img class="icon" :src="item.chainInfo?.iconPath" />
+            {{item.chainInfo?.chainName}}
         </div>
         <div class="item-detail" @click="selectCurrency(item)">
             <div class="left">
-                <img class="icon-currency" :src="item.iconPath" />
+                <img class="icon-currency" :src="item?.iconPath" />
                 <div class="currency-info">
                     <div class="name">{{ item.currencyCode == 'USD' ? 'USD' : item.tokenSymbol }}</div>
                     <div class="desc">{{ item.currencyCode == 'USD' ? 'Paypal' : item.currencyName }}</div>

src/view/components/custom-card-cover.vue

@@ -101,7 +101,7 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits, watch, ref, computed, onMounted } from "vue";
+import { defineProps, defineEmits, ref, computed, onMounted } from "vue";
 import { formatSecondsAsDaysOrTime } from "@/uilts/help";
 import ComponentZoom from "./component-zoom.vue";
 import { RewardType, PlayType } from "@/types";
@@ -123,7 +123,7 @@ const props = defineProps({
                     nickName: "",
                 },
                 rewardType: RewardType.money,
-                customizedReward: ""
+                customizedReward: "",
             };
         },
     },
@@ -141,10 +141,6 @@ const defaultTotalWidth = isMoneyRewardCpd.value ? 360 : 450;
 
 let amount_font_size = ref(defaultBaseWidth);
 
-watch(props, () => {
-    setFontSize();
-})
-
 const setFontSize = () =>{
     let id = isMoneyRewardCpd.value ? 'preview-after-amount' : 'custom-name';
     let lendom = document.querySelector(`#${id}`);

src/view/iframe/publish/components/preview-card.vue

@@ -3,7 +3,7 @@
     <div class="wrapper">
         <div class="card-container">
             <!-- 安装之后的卡片样式 -->
-            <div v-show="installStatus" class="left" :style="{'width': reviewCanvasParams.width+ 'px'}">
+            <div v-if="installStatus" class="left" :style="{'width': reviewCanvasParams.width+ 'px'}">
                 <div class="head" :style="{'zoom': reviewCanvasParams.zoom}">
                     <img :src="userInfo.avatarUrl"
                         class="avatar"/>
@@ -31,7 +31,7 @@
                                 avatarUrl: userInfo.avatarUrl
                             },
                             rewardType: baseFormData.rewardType,
-                            customizedReward: baseFormData.customizedReward
+                            customizedReward: baseFormData.customizedReward,
                         }"></custom-card-cover>
                     </div>
                 </div>
@@ -39,7 +39,7 @@
 
             <!-- 安装之前的卡片样式 -->
             <div class="content-before"
-                v-show="!installStatus" 
+                v-else 
                 :style="{'width': (baseFormData.rewardType === RewardType.money) ? `${reviewCanvasParams.width}px` : '100%'}">
                 <div class="head" 
                     :style="{'zoom': reviewCanvasParams.zoom}">
@@ -71,7 +71,7 @@
                                 avatarUrl: userInfo.avatarUrl
                             },
                             rewardType: baseFormData.rewardType,
-                            customizedReward: baseFormData.customizedReward
+                            customizedReward: baseFormData.customizedReward,
                         }">
                     </custom-card-horizontal-cover>
                 </div>