ソースを参照

[edit][display]

zhangwei 3 年 前
コミット
77412f7e03
3 ファイル変更39 行追加33 行削除
  1. 28 24
      src/logic/twitter.js
  2. 4 3
      src/manifest.production.json
  3. 7 6
      src/view/red-packet.vue

+ 28 - 24
src/logic/twitter.js

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import { getChromeStorage, setChromeStorage,LANDING_PAGE } from '../uilts/chromeExtension.js'
+import { getChromeStorage, setChromeStorage, LANDING_PAGE } from '../uilts/chromeExtension.js'
 import { getTtwitterRequestToken, twitterLogin } from '../server/twitter.js'
 import { srcPublishSuccess } from '../http/publishApi'
 
@@ -42,26 +42,26 @@ export function backTwitterPinLoginCode(code) {
         }
     })
     chrome.cookies.getAll(LANDING_PAGE, (e = []) => {
-            let _str = '[]'
-            if (e.length > 0) {
-                _str = e[0].value
-            }
-            let _arr = JSON.parse(decodeURIComponent(_str))
-            let receivedIds = []
-            if (_arr.length > 0) {
-                for (let i in _arr) {
-                    receivedIds.push(_arr[i].receivedId)
-                }
+        let _str = '[]'
+        if (e.length > 0) {
+            _str = e[0].value
+        }
+        let _arr = JSON.parse(decodeURIComponent(_str))
+        let receivedIds = []
+        if (_arr.length > 0) {
+            for (let i in _arr) {
+                receivedIds.push(_arr[i].receivedId)
             }
-            // 发送请求
-            // token,code
-            twitterLogin(authToken, code, receivedIds).then(res => {
-                if (res.code == 0) {
-                    setChromeStorage({ userInfo: JSON.stringify(res.data) })
-                    chrome.cookies.remove(LANDING_PAGE)
-                }
-            })
         }
+        // 发送请求
+        // token,code
+        twitterLogin(authToken, code, receivedIds).then(res => {
+            if (res.code == 0) {
+                setChromeStorage({ userInfo: JSON.stringify(res.data) })
+                chrome.cookies.remove(LANDING_PAGE)
+            }
+        })
+    }
     )
 
 }
@@ -315,13 +315,13 @@ function _createBtnDom(port) {
     loadingImg.src = require("../assets/img/icon-btn-loading.png");
     loadingImg.style.cssText = 'width:20px;height: 20px;margin-right:3px;-webkit-animation:load 1.1s infinite linear;';
 
-    let style = document.createElement('style'); 
-    style.innerHTML=" @-webkit-keyframes load{from{ transform: rotate(0deg);} to{transform: rotate(360deg);}}"; 
-    document.getElementsByTagName('head').item(0).appendChild(style); 
+    let style = document.createElement('style');
+    style.innerHTML = " @-webkit-keyframes load{from{ transform: rotate(0deg);} to{transform: rotate(360deg);}}";
+    document.getElementsByTagName('head').item(0).appendChild(style);
 
     let deBtn = document.createElement('span');
     const shadowDiv = document.createElement('div');
-    deBtn.innerHTML  = '<span>DeNet</span>';
+    deBtn.innerHTML = '<span>DeNet</span>';
     deBtn.id = 'de-btn';
     deBtn.style.cssText = 'width:220px;height: 52px;text-align:center;line-height:52px;margin-bottom: 4px;margin-top: 4px;background: linear-gradient(274.8deg, #FF9900 -3.69%, #BD00FF 69.71%, #00F0FF 122.65%);color:#fff;font-size:15px;font-weight:700;border-radius:100px;cursor: pointer;display: flex;align-items: center;justify-content: center;';
 
@@ -400,7 +400,11 @@ function replaceDOMRedPacket(_dom, postId) {
     if (!_dom || _dom.querySelector('iframe')) {
         return
     }
-    _dom.innerHTML = ''
+    let _len = _dom.childNodes.length
+    for (let i = 0; i < _len; i++) {
+        _dom.children[i].style.display = 'none'
+    }
+
     let _iframe = document.createElement('iframe')
     _iframe.id = postId
     _iframe.src = chrome.runtime.getURL('/iframe/red-packet.html') + '?postId=' + postId;

+ 4 - 3
src/manifest.production.json

@@ -21,7 +21,8 @@
         }
     ],
     "host_permissions": [
-        "*://*/*"
+        "*://*/*",
+        "https://de-net-test.piaoquantv.com"
       ],
     "permissions":[
         "tabs",
@@ -37,8 +38,8 @@
     "web_accessible_resources": [
         {
           "resources": [
-            "/iframe/red-packet.html",
-            "/iframe/publish.html"
+            "/iframe/publish.html",
+            "/iframe/red-packet.html"
           ],
           "matches": [
             "<all_urls>"

+ 7 - 6
src/view/red-packet.vue

@@ -181,8 +181,7 @@
     <div v-else-if="data.status == 'error'" class="error">
       <img :src="require('../assets/svg/icon-error.svg')" alt />
       <div class="txt">
-        oops, new accounts cannot participate in this event,
-        better luck next time!
+        {{ data.error_txt }}
       </div>
     </div>
   </div>
@@ -207,6 +206,8 @@ let data = reactive({
   detail: {},
   srcContentId: '',
   close_title: 'Better luck next time!',
+  error_txt: `oops, new accounts cannot participate in this event,
+        better luck next time!`,
   receiveAmount: 0,
   money: 0,
   // 状态
@@ -336,12 +337,12 @@ function clickOpenRedPacket() {
         // 
         if (res_arr.length > 0) {
           let _res = res_arr.filter((item) => { return item.postId == data.postId })[0] || null
-          if(_res){
+          if (_res) {
             data.status = 'opened'
-            data.money = _res.receiveAmount  
+            data.money = _res.receiveAmount
           }
-        }else{
-          handleRedPacket()    
+        } else {
+          handleRedPacket()
         }
       })
     } else {