Quellcode durchsuchen

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

zhangwei vor 2 Jahren
Ursprung
Commit
61df788ad1
2 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
  1. 1 1
      src/assets/svg/icon-while-yes.svg
  2. 5 1
      src/view/iframe/treasure-hunt/index.vue

+ 1 - 1
src/assets/svg/icon-while-yes.svg

@@ -1,3 +1,3 @@
 <svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 15C11.6421 15 15 11.6421 15 7.5C15 3.35786 11.6421 0 7.5 0C3.35786 0 0 3.35786 0 7.5C0 11.6421 3.35786 15 7.5 15ZM3.96965 8.83499L6.50193 11.3675L7.1218 11.9874L7.6383 11.2791L12.219 4.99666L11.007 4.11293L6.94276 9.68696L5.03035 7.77438L3.96965 8.83499Z" fill="white"/>
+<path d="M3 7.5L7.15975 11.4647L12.8755 3.62562" stroke="white" stroke-width="2"/>
 </svg>

+ 5 - 1
src/view/iframe/treasure-hunt/index.vue

@@ -179,7 +179,8 @@ const handleCommon = (res, callback) => {
                 data: {
                     screen_name: state.detail.postUserInfo.nickName,
                     tweetId: state.tweetId,
-                    objectType: Report.objectType.tweetPostBinded
+                    objectType: Report.objectType.tweetPostBinded,
+                    iframeId: state.iframeId
                 }
             })
             state.init()
@@ -313,6 +314,9 @@ function onRuntimeMsg() {
                 }
                 break
             case 'CONTENT_API_GET_TWEET_USER_INFO_RES':
+                if(state.iframeId != req.iframeId) {
+                  return;
+                }
                 let twitterFans = 0;
                 let { user } = req.data || {};
                 if (user && user.result && user.result.legacy) {