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

src/log-center/logEnum.js

@@ -9,6 +9,8 @@ export const redPacketType = {
     nftGroupSale: 3,
     treasure: 4,
     postEditor: 5,
+    giveaway: 0,
+    lottery: 1
 }
 
 export const businessType = {

src/logic/background/twitter.js

@@ -346,7 +346,8 @@ export function onInstalledCreateTab() {
                       objectType: Report.objectType.chrome_extension_installed,
                       funcName: 'onInstalledCreateTab',
                       postId: res.postId || '',
-                      shareLinkId: res.shareLinkId || ''
+                      shareLinkId: res.shareLinkId || '',
+                      'channel-name': res.channelName
                   })
               }, 5000)
             });
@@ -451,7 +452,7 @@ export function onInstalledCreateTab() {
 
 /**
  * 在popop重新发送
- * @param {*} req 
+ * @param {*} req
  */
 export function popupRePublish(req) {
     try {
@@ -516,11 +517,11 @@ export async function setMessageCount() {
 function createAlarm() {
     try {
         let alarmInfo = {
-            //1分鐘之後開始(該值不能小於1) 
+            //1分鐘之後開始(該值不能小於1)
             delayInMinutes: 1,
-            //與上方等同的寫法是 
+            //與上方等同的寫法是
             // when : Date.now() + n,
-            //開始後每一分鐘執行一次(該值不能小于1) 
+            //開始後每一分鐘執行一次(該值不能小于1)
             periodInMinutes: 1
         };
 
@@ -739,4 +740,4 @@ const createTabShowGiveaway = (params) => {
     chrome.tabs.create({
         url: params.url,
     });
-}
+}

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

@@ -37,7 +37,7 @@
             </div>
 
             <div class="content-text">
-                <template v-if="data.type != PlayType.treasure">
+                <div style="margin-left: 35px" v-if="data.type != PlayType.treasure">
                     <div class="title">
                         <span>{{data.currencyCode == 'USD' ? 'US Dollar' : data.tokenSymbol}} </span>
                         &nbsp;GIVEAWAY
@@ -64,7 +64,7 @@
                             {{data.totalCount}} WINNERS TO SHARE
                         </template>
                     </div>
-                </template>
+                </div>
                 <div class="treasure-layout" v-else>
                     <div class="treasure-row-1">
                         <span class="left">Treasure</span>

src/view/iframe/publish/components/get-more.vue

@@ -52,7 +52,8 @@ const jumpMore = () => {
       pageSource: props.reportData.pageSource,
       businessType: Report.businessType.buttonClick,
       objectType: Report.objectType.getMoreGiveaway,
-      postId: props.reportData.postId
+      postId: props.reportData.postId,
+      redPacketType: props.reportData.redPacketType
     });
     if (moreUrl.value) {
         window.open(moreUrl.value)

src/view/iframe/red-packet/luck-draw.vue

@@ -202,7 +202,8 @@
             </div>
             <get-more :reportData="{
                 pageSource: Report.pageSource.received_success_page,
-                postId: state.postId
+                postId: state.postId,
+                redPacketType: Report.redPacketType.lottery
             }"></get-more>
         </div>
 
@@ -350,7 +351,8 @@
                 </div>
                 <get-more :style_type="2" :reportData="{
                     pageSource: Report.pageSource.waitingLotteryPage,
-                    postId: state.postId
+                    postId: state.postId,
+                    redPacketType: Report.redPacketType.lottery
                 }"></get-more>
                 <div class="notification_switch" v-if="state.notification_show">
                     <span>Announcement Notification</span>
@@ -410,7 +412,8 @@
             </div>
             <get-more :reportData="{
                 pageSource: Report.pageSource.missingLotteryPage,
-                postId: state.postId
+                postId: state.postId,
+                redPacketType: Report.redPacketType.lottery
             }" v-if="state.close_status != '等待结果'"></get-more>
         </div>
 

src/view/iframe/red-packet/red-packet.vue

@@ -212,7 +212,8 @@
       </div>
       <get-more :reportData="{
         pageSource: Report.pageSource.received_success_page,
-        postId: state.postId
+        postId: state.postId,
+        redPacketType: Report.redPacketType.giveaway
       }"></get-more>
     </div>
 
@@ -369,7 +370,8 @@
       </div>
       <get-more :reportData="{
         pageSource: Report.pageSource.expiredPage,
-        postId: state.postId
+        postId: state.postId,
+        redPacketType: Report.redPacketType.giveaway
       }"></get-more>
     </div>
 

src/view/iframe/treasure-hunt/all-receive-list.vue

@@ -199,6 +199,7 @@ const list = () => {
         .list {
             background: #fff;
             overflow-y: auto;
+            height: 100%;
 
             .item {
                 height: 60px;

src/view/iframe/treasure-hunt/components/boxs.vue

@@ -3,6 +3,7 @@
         <!-- 箱子 -->
         <div class="box-process">
             <div class="item" v-for="item, i in state.boxs"
+                :key="i"
                 :style="{ 'margin-left': item.icon_margin_left, 'z-index': 10 - i }">
                 <!--悬浮 -->
                 <!-- < hover - tip : txt=" item.txt" v-show="item.show || item.openStatus" :icon="item.hover_icon">
@@ -10,15 +11,15 @@
                 <!-- 金额 -->
                 <span class="money" :style="{ 'color': item.money_color, 'top': item.money_top }">
                     <img :src="require('@/assets/svg/icon-green-yes.svg')" alt="" v-if="item.openStatus == 1" />
-                    {{ item.txt }}
+                    {{ item.openStatus == 0 ? item.txt : item.amountUsdValue }}
                 </span>
                 <!-- 宝箱 -->
                 <img :src="item.icon" alt="" @mouseenter="mouseItem(i)" @mouseleave="mouseLeaveItem(i)"
                     :style="{ 'width': item.icon_width, 'height': item.icon_width }" class="box"
-                    :class="{ 'active': item.openStatus == 0 && item.taskFinishStatus == 1 }" @click="clickBox(item)" />
+                    :class="{ 'active': i == 0 && item.openStatus == 0 ? true : item.openStatus == 0 && state.boxs[i-1]['openStatus'] == 1  }" @click="clickBox(item)" />
                 <!-- 发光 -->
                 <img :src="require('@/assets/img/icon-flash-active.png')" alt="" class="flash"
-                    v-if="item.openStatus == 0 && item.taskFinishStatus == 1"
+                    v-if="i == 0 && item.openStatus == 0 ? true : item.openStatus == 0 && state.boxs[i-1]['openStatus'] == 1"
                     :style="{ 'margin-left': item.flash_margin_top, 'margin-top': item.flash_margin_top, 'width': item.flash_width, 'height': item.flash_width }" />
 
                 <!-- 进度条 -->
@@ -30,6 +31,7 @@
         <!-- 人数 -->
         <div class="people">
             <div class="item" v-for="item, i in state.boxs"
+            :key="i"
                 :style="{ 'margin-left': item.icon_margin_left, 'width': item.icon_width }">
                 <img :src="require('@/assets/svg/icon-user1.svg')" alt="" />
                 <span>{{ item.inviteProgress }}</span>
@@ -331,4 +333,4 @@ const boxsStatus = () => {
         -webkit-transform: translateY(-1px);
     }
 }
-</style>
+</style>

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

@@ -31,7 +31,7 @@
             v-click-log="state.log_invite_btn_click" @onClick="clickBtn" font-weight="600"></v-btn>
       <div class="mask" v-show="showShareTips">
         <div class="content">
-          <img class="icon-loading" :src="require('@/assets/svg/icon-loading-channel.svg')" />
+          <img class="icon-loading" :src="channelLoadingImg" />
           <div class="text">
             Link copied to clipboard
              <br/>
@@ -52,6 +52,9 @@ import { setChromeStorage } from '@/uilts/chromeExtension.js'
 
 let ClipboardJS = require('clipboard');
 
+let loadingImg = require('@/assets/img/icon-loading-channel.png');
+
+let channelLoadingImg = ref(loadingImg);
 let state = inject('state')
 
 state.log_invite_btn_show = {
@@ -166,6 +169,7 @@ async function clickBtn() {
 }
 
 const clickShare = (item) => {
+    channelLoadingImg.value = loadingImg;
     var clipboard = new ClipboardJS('.share-item');
     clipboard.on('success', function (e) {
         // state.toast.txt = 'Copy Successfully'
@@ -203,6 +207,7 @@ const clickShare = (item) => {
     } else {
         setTimeout(() => {
           showShareTips.value = false;
+          channelLoadingImg.value = '';
           chrome.tabs.create({
               url: item.redirectPath
           });
@@ -215,7 +220,8 @@ const clickShare = (item) => {
         shareLinkId: state.invite_code,
         myShareLinkId: state.detail.inviteCopyUrl,
         currentInvitedNum: state.inviteCount,
-        postId: state.postId
+        postId: state.postId,
+        redPacketType: Report.redPacketType.treasure
     }, {
         'channel-name': item.name
     });
@@ -365,7 +371,6 @@ const clickCopy = () => {
       .icon-loading {
         width: 60px;
         height: 60px;
-        animation: loading 1 1s linear forwards;
         margin-bottom: 30px;
       }
 
@@ -375,18 +380,6 @@ const clickCopy = () => {
         color: #FFFFFF;
       }
     }
-
-
-  @keyframes loading {
-      0% {
-          transform: rotate(0);
-      }
-
-      100% {
-          transform: rotate(280deg);
-      }
-  }
-
   @keyframes fade-in-gray {
     from {
       background: none;

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

@@ -325,11 +325,15 @@ async function clickBtn() {
     }
     if (state.cover_status == '奖励已被领光') {
         Report.reportLog({
-            pageSource: Report.pageSource.pending_page,
+            pageSource: Report.pageSource.expiredPage,
             businessType: Report.businessType.buttonClick,
             objectType: Report.objectType.getMoreGiveaway,
-            postId: state.postId
+            postId: state.postId,
+            shareLinkId: state.invite_code,
+            currentInvitedNum: state.inviteCount,
+            redPacketType: Report.redPacketType.treasure
         });
+
         window.open('https://twitter.com/search?q=%23denet');
         return
     }

src/view/iframe/treasure-hunt/index.vue

@@ -299,6 +299,15 @@ const handleStatus = (callback) => {
         state.page = '封面页'
         state.cover_status = '奖励已被领光'
         state.btn_loading = false
+        Report.reportLog({
+          pageSource: Report.pageSource.expiredPage,
+          businessType: Report.businessType.pageView,
+          postId: state.postId,
+          shareLinkId: state.invite_code,
+          myShareLinkId: state.detail.inviteCopyUrl,
+          currentInvitedNum: state.inviteCount,
+          redPacketType: Report.redPacketType.treasure
+        });
         return
     }
     callback && callback()

src/view/popup/tabbar-page/wallter/popup.vue

@@ -25,7 +25,7 @@
             </div>
         </div>
 
-        <currency-list 
+        <currency-list
             v-if="userInfo.accessToken"
             style="height: calc(100% - 103px);"
             ref="currencyListDom"
@@ -90,13 +90,16 @@ const init = () => {
     checkLoginState((res) => {
         if (res) {
             getAccountBalance();
+            setMessageCount();
+            if(window.location.pathname.indexOf('popup-page.html') > -1) {
+              return
+            }
             Report.reportLog({
                 pageSource: Report.pageSource.denetHomePage,
                 businessType: Report.businessType.pageView,
             }, {
                 type: window.location.href.indexOf('home.html') > -1 ? 'web' : 'extensions'
             });
-            setMessageCount();
         } else {
             Report.reportLog({
                 pageSource: Report.pageSource.denetLogin,