浏览代码

[edit] invite

wenliming 2 年之前
父节点
当前提交
33f3ff90be

+ 16 - 14
src/logic/background/facebook.js

@@ -10,21 +10,23 @@ export function facebookShareSuccess(params, sender) {
         let { id } = sender.tab || {};
         let { id } = sender.tab || {};
         chrome.tabs.remove(id);
         chrome.tabs.remove(id);
 
 
-        fetchAddFinishEvent({
+        if(!data.bizType) {
+          fetchAddFinishEvent({
             eventType: data.type,
             eventType: data.type,
             luckdropId: data.taskLuckdropId
             luckdropId: data.taskLuckdropId
-        }).then(res => {
-            if (res.code == 0) {
-                setTimeout(() => {
-                    sendActivetabMessage({
-                        actionType: 'BG_FACEBOOK_SHARE_SUCCESS',
-                        data: data
-                    });
-                })
-            }
-        }).catch((error) => {
-            console.log('catch', error)
-        })
+          }).then(res => {
+              if (res.code == 0) {
+                  setTimeout(() => {
+                      sendActivetabMessage({
+                          actionType: 'BG_FACEBOOK_SHARE_SUCCESS',
+                          data: data
+                      });
+                  })
+              }
+          }).catch((error) => {
+              console.log('catch', error)
+          })
+        }
     } catch (error) {
     } catch (error) {
         Report.reportLog({
         Report.reportLog({
             objectType: Report.objectType.background_function_catch,
             objectType: Report.objectType.background_function_catch,
@@ -52,4 +54,4 @@ function sendActivetabMessage(message = {}) {
             errMsg: error.message
             errMsg: error.message
         })
         })
     }
     }
-}
+}

+ 1 - 5
src/logic/content/facebook.js

@@ -63,11 +63,7 @@ function shareCallback() {
         let params = JSON.parse(urlParams.get('params'));
         let params = JSON.parse(urlParams.get('params'));
         if (params) {
         if (params) {
             chrome.storage.local.remove("shareFacebookData");
             chrome.storage.local.remove("shareFacebookData");
-            if(params.bizType == 'TEASURE_INVITE') {
-
-            } else {
-              chrome.runtime.sendMessage({ actionType: "CONTENT_FACEBOOK_SHARE_SUCCESS", data: params })
-            }
+            chrome.runtime.sendMessage({ actionType: "CONTENT_FACEBOOK_SHARE_SUCCESS", data: params })
         }
         }
     }
     }
 }
 }

+ 0 - 2
src/logic/content/twitter.js

@@ -461,7 +461,6 @@ export function hideNoticeBindTweet() {
  * @private
  * @private
  */
  */
 function _deNetBtnClick(params = {}) {
 function _deNetBtnClick(params = {}) {
-    debugger
     getUserInfo((res) => {
     getUserInfo((res) => {
         if (res) {
         if (res) {
             if (window.location.pathname != '/home') {
             if (window.location.pathname != '/home') {
@@ -767,7 +766,6 @@ export function bindTwitterArtMethod() {
 
 
 
 
 import parseCard from './ParseCard'
 import parseCard from './ParseCard'
-import { useFavicon } from '_@vueuse_core@8.9.4@@vueuse/core'
 
 
 // 检测dom改变
 // 检测dom改变
 // 获取短链接
 // 获取短链接

+ 43 - 5
src/view/iframe/treasure-hunt/components/invite-friends.vue

@@ -25,6 +25,9 @@ import VBtn from '@/view/iframe/treasure-hunt/components/btn.vue'
 import { inviteChannel } from '@/http/treasure'
 import { inviteChannel } from '@/http/treasure'
 import { inject, onMounted } from 'vue'
 import { inject, onMounted } from 'vue'
 import Report from "@/log-center/log"
 import Report from "@/log-center/log"
+import { getFrontConfig } from "@/http/account";
+import { faceShareRedirectUrl } from '@/http/configAPI'
+import { setChromeStorage } from '@/uilts/chromeExtension.js'
 
 
 let ClipboardJS = require('clipboard');
 let ClipboardJS = require('clipboard');
 
 
@@ -61,8 +64,15 @@ state.log_invite_copy_btn_click = {
     currentInvitedNum: state.detail.inviteCount,
     currentInvitedNum: state.detail.inviteCount,
     postId: state.postId
     postId: state.postId
 }
 }
+
+let facebookAppConfig = {
+  facebookAppId: "",
+  faceShareRedirectUrl
+};
+
 onMounted(() => {
 onMounted(() => {
     state.btn_loading = false
     state.btn_loading = false
+    setFrontConfig();
     try {
     try {
         chrome.management.get('ophjlpahpchlmihnnnihgmmeilfjmjjc', (res) => {
         chrome.management.get('ophjlpahpchlmihnnnihgmmeilfjmjjc', (res) => {
             let linePluginInstalled = 0
             let linePluginInstalled = 0
@@ -106,11 +116,28 @@ const clickShare = (item) => {
         }, 2000)
         }, 2000)
         e.clearSelection();
         e.clearSelection();
     })
     })
-    chrome.tabs.create({
+    if(item.name == 'facebook') {
+        setChromeStorage({
+            shareFacebookData: JSON.stringify({
+                contentStr: item.inviteContent
+            })
+        })
+        let cbParams = {
+          bizType: 'TEASURE_INVITE'
+        }
+        let url = `https://www.facebook.com/dialog/share?app_id=${facebookAppConfig.facebookAppId}&display=popup&href=${item.treasureInviteUrl}&redirect_uri=${facebookAppConfig.faceShareRedirectUrl}?params=${JSON.stringify(cbParams)}`;
+
+        chrome.windows.create({
+          width: 800,
+          type: 'normal',
+          url
+        }, function (window) {
+        })
+    } else {
+      chrome.tabs.create({
         url: item.redirectPath
         url: item.redirectPath
-    });
-    let strArr = item.treasureInviteUrl.split('/');
-    let channelName = window.atob(strArr[strArr.length-1]);
+      });
+    }
     Report.reportLog({
     Report.reportLog({
       businessType: Report.businessType.buttonClick,
       businessType: Report.businessType.buttonClick,
       pageSource: Report.pageSource.inviteFriendsPage,
       pageSource: Report.pageSource.inviteFriendsPage,
@@ -119,10 +146,21 @@ const clickShare = (item) => {
       myShareLinkId: state.detail.inviteCopyUrl,
       myShareLinkId: state.detail.inviteCopyUrl,
       currentInvitedNum: state.detail.inviteCount,
       currentInvitedNum: state.detail.inviteCount,
     }, {
     }, {
-      'channel-name': channelName
+      'channel-name': item.name
     });
     });
 }
 }
 
 
+const setFrontConfig = () => {
+  getFrontConfig({
+    params: {},
+  }).then((res) => {
+    if (res.code == 0) {
+      facebookAppConfig.facebookAppId = res.data.fbClientId;
+    }
+  });
+};
+
+
 
 
 const clickCopy = () => {
 const clickCopy = () => {
     var clipboard = new ClipboardJS('.copy-btn');
     var clipboard = new ClipboardJS('.copy-btn');

+ 1 - 1
src/view/iframe/treasure-hunt/cover.vue

@@ -161,7 +161,7 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
                   let legacy = item.user.result.legacy;
                   let legacy = item.user.result.legacy;
                   list.push({
                   list.push({
                     name: legacy.screen_name,
                     name: legacy.screen_name,
-                    followed: legacy.followed_by
+                    followed: legacy.following
                   })
                   })
                 }
                 }
               }
               }