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

src/http/configAPI.js

@@ -9,9 +9,9 @@ const api = {
 }
 
 const logApi = {
-	production: 'https://log.weiqumeta.com',
-	pre: 'https://prelog.weiqumeta.com',
-	development: 'https://testlog.weiqumeta.com'
+	production: 'https://log.denetme.net',
+	pre: 'https://prelog.denetme.net',
+	development: 'https://testlog.denetme.net'
 }
 
 const page = {
@@ -28,7 +28,7 @@ const website = {
 
 export const baseAPIUrl = api[process.env.NODE_ENV] + '/denet'
 
-export const logAPIUrl = logApi[process.env.NODE_ENV] + '/log-center'
+export const logAPIUrl = logApi[process.env.NODE_ENV] + '/denet/log'
 
 export const pageUrl = page[process.env.NODE_ENV]
 
@@ -40,4 +40,4 @@ export const faceShareRedirectUrl = `${pageUrl}/facebook/shareCallback`;
 
 export const payAchNoticeUrl = `${pageUrl}/ach_pay/pay_notice`;
 
-export const iframeHost = process.env.VUE_APP_IFRAME_HOST;
+export const iframeHost = process.env.VUE_APP_IFRAME_HOST;

src/http/logApi.js

@@ -4,7 +4,7 @@ import { commonFetch } from '@/http/fetch'
 
 // export function logApi(params) {
 //     return service({
-//         url: `${logAPIUrl}/statistics/uploadLogFromFrontend
+//         url: `${logAPIUrl}/uploadLogFromFrontend`,
 //         `,
 //         method: 'post',
 //         data: params
@@ -13,7 +13,7 @@ import { commonFetch } from '@/http/fetch'
 
 export function logApi(params = {}) {
     return commonFetch({
-        url: `${logAPIUrl}/statistics/uploadLogFromFrontend`,
+        url: `${logAPIUrl}/uploadLogFromFrontend`,
         baseInfo: {
             pageSource: params.params.pageSource || ''
         },
@@ -26,4 +26,4 @@ export function reportFrontLogApi(params = {}) {
         url: `/log/reportFrontLog`,
         params: params
     })
-}
+}

src/log-center/autoLog/show.js

@@ -13,10 +13,10 @@ class ShowLogObserver {
     init() {
         this._observe = new IntersectionObserver((entries, observer) => {
             entries.forEach((entry) => {
-                if (entry.isIntersecting) {
+                if (entry.intersectionRatio > 0.5) {
                     this.report(entry);
                     // show-log-once  ===  '1' &&  曝光之后取消观察
-                    if (entry?.target?.getAttribute('show-log-once') === '1') { 
+                    if (entry?.target?.getAttribute('show-log-once') === '1') {
                         this.remove(entry.target);
                     }
                 }

src/log-center/logEnum.js

@@ -106,6 +106,9 @@ export const pageSource = {
     inviteFriendsPage: "invite-friends-page",
     openTreasurePage: "open-treasure-page",
     beenInvitedPage: "been-invited-page",
+    waitingLotteryPage: "waiting-lottery-page",
+    missingLotteryPage: "missing-lottery-page",
+    expiredPage: "expired-page",
 
     // 待开红包页
     pending_page: 'pending-page',

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

@@ -24,11 +24,16 @@
 import { getFrontConfig } from "@/http/account";
 import { number } from "mathjs";
 import { onBeforeMount, ref, defineProps } from "vue";
+import Report from "@/log-center/log"
+
 const props = defineProps({
     style_type: {
         type: Number,
         default: 1,
     },
+    reportData: {
+        type: Object,
+    }
 })
 
 // const
@@ -43,6 +48,12 @@ onBeforeMount(() => {
 })
 
 const jumpMore = () => {
+    Report.reportLog({
+      pageSource: props.reportData.pageSource,
+      businessType: Report.businessType.buttonClick,
+      objectType: Report.objectType.getMoreGiveaway,
+      postId: props.reportData.postId
+    });
     if (moreUrl.value) {
         window.open(moreUrl.value)
     }
@@ -127,4 +138,4 @@ const jumpMore = () => {
         transform-origin: 0 0;
     }
 }
-</style>
+</style>

src/view/iframe/publish/give-dialog.vue

@@ -2511,7 +2511,6 @@ onMounted(() => {
                         .form-cell-content {
                             .select-mode-ele {
                                 display: flex;
-                                cursor: pointer;
                                 position: relative;
                                 height: 120px;
 
@@ -2528,6 +2527,7 @@ onMounted(() => {
                                     height: 80px;
                                     border-radius: 5px;
                                     margin-right: 13px;
+                                    cursor: pointer;
                                 }
 
                                 .img-tips {

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

@@ -200,7 +200,9 @@
                     </div>
                 </div>
             </div>
-            <get-more></get-more>
+            <get-more :reportData="{pageSource: Report.pageSource.received_success_page,
+                                    postId: state.postId
+                                    }"></get-more>
         </div>
 
 
@@ -347,7 +349,10 @@
                     <img :src="require('@/assets/svg/icon-win-time.svg')" alt />
                     <span>{{ state.count_down_time || '' }}</span>
                 </div>
-                <get-more :style_type="2"></get-more>
+                <get-more :style_type="2"
+                          :reportData="{pageSource: Report.pageSource.waitingLotteryPage,
+                                        postId: state.postId
+                                      }"></get-more>
                 <div class="notification_switch" v-if="state.notification_show">
                     <span>Announcement Notification</span>
                     <a-switch v-model:checked="state.notification_switch" @change="changeNotification" />
@@ -404,7 +409,10 @@
                     <img :src="require('@/assets/svg/icon-error.svg')" alt />
                 </div>
             </div>
-            <get-more v-if="state.close_status != '等待结果'"></get-more>
+            <get-more :reportData="{
+              pageSource: Report.pageSource.missingLotteryPage,
+              postId: state.postId
+            }" v-if="state.close_status != '等待结果'"></get-more>
         </div>
 
 
@@ -961,7 +969,7 @@ async function clickFollowAll(item, is_all) {
             arr_name.push(item[i])
         }
     }
-    // ---- 
+    // ----
     state.detail.finishTaskTypeV2 = state.detail.finishTaskTypeV2.toString() || ''
     if (state.window_origin.indexOf('facebook.com') >= 0) {
         state.detail.finishTaskTypeV2 = '2'
@@ -1276,7 +1284,7 @@ const handleStatusPage = () => {
         state.detail.taskCondition = JSON.parse(state.detail.taskCondition)
         // 如果 任务完成状态 = 未完成 & 红包状态 = 进行中
         if (state.detail.myReceived.taskFinishStatus == 0 && state.detail.status == 1) {
-            // 显示任务未完成页面 
+            // 显示任务未完成页面
             showOpenedPage()
             if (state.process_mode != 'production') {
                 getValidity()
@@ -1309,7 +1317,7 @@ const handleStatusPage = () => {
             if (state.detail.status == 1) {
                 // 显示未打开页面
                 showNotOpenPage()
-                // 否则 
+                // 否则
             } else {
                 // 显示已经过期页面
                 showCloseEndTimePage()
@@ -1322,7 +1330,7 @@ const handleStatusPage = () => {
         if (state.detail.status == 1) {
             // 如果 过了红包的领取截止时间 = true
             if (state.detail.receiveTimeExpired) {
-                // 显示过期页面      
+                // 显示过期页面
                 showCloseEndTimePage()
                 showCloseEndTimePageReport()
                 // 如果 过了红包的领取截止时间 = false
@@ -1460,7 +1468,7 @@ const doTaskReport = (req, sender) => {
         case 'like':
             event_type = 2
             state.done.like = req.task_done
-            // 
+            //
             if (!req.task_done && req.do_type == 'api') {
                 window.open(`https://twitter.com/intent/like?tweet_id=${state.tweetId}`)
             }
@@ -2228,7 +2236,7 @@ function openInviteUrl() {
 }
 
 </script>
- 
+
 <style lang="scss" scoped>
 html,
 body {

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

@@ -210,7 +210,10 @@
           </div>
         </div>
       </div>
-      <get-more></get-more>
+      <get-more  :reportData="{
+                    pageSource: Report.pageSource.received_success_page,
+                    postId: state.postId
+                  }" ></get-more>
     </div>
 
 
@@ -364,7 +367,10 @@
           <img :src="require('@/assets/svg/icon-error.svg')" alt />
         </div>
       </div>
-      <get-more></get-more>
+      <get-more :reportData="{
+                    pageSource: Report.pageSource.expiredPage,
+                    postId: state.postId
+                  }" ></get-more>
     </div>
 
 
@@ -845,7 +851,7 @@ async function clickFollowAll(item, is_all) {
       arr_name.push(item[i])
     }
   }
-  // ---- 
+  // ----
   state.detail.finishTaskTypeV2 = state.detail.finishTaskTypeV2.toString() || ''
   if (state.window_origin.indexOf('facebook.com') >= 0) {
     state.detail.finishTaskTypeV2 = '2'
@@ -1089,19 +1095,19 @@ const handleStatusPage = () => {
   // ---- 判断结构 ----
   // 如果 红包状态 = 未开始
   //    显示未打开页面 return
-  // 
+  //
   // 如果 我领取过了
   //    如果 任务完成状态 = 未完成
   //        显示任务未完成页面
   //    如果 任务完成状态 = 已经完成
   //        如果 (货币类奖品 && 领取到红包金额 = 0) || (自定义奖品 && winner = 0)
   //            显示兔子页面
-  //        否则 
+  //        否则
   //            显示成功页面
   //    如果 任务完成状态 = 已经过期
   //        如果 红包状态 = 进行中
   //            显示未打开页面
-  //        否则 
+  //        否则
   //            显示已经过期页面
 
   // 如果 我没有领取过 & 红包状态 = 进行中
@@ -1146,7 +1152,7 @@ const handleStatusPage = () => {
       if (state.detail.status == 1) {
         // 显示未打开页面
         showNotOpenPage()
-        // 否则 
+        // 否则
       } else {
         // 显示已经过期页面
         showCloseEndTimePage()
@@ -1159,7 +1165,7 @@ const handleStatusPage = () => {
     if (state.detail.status == 1) {
       // 如果 过了红包的领取截止时间 = true
       if (state.detail.receiveTimeExpired) {
-        // 显示过期页面      
+        // 显示过期页面
         showCloseEndTimePage()
         showCloseEndTimePageReport()
         // 如果 过了红包的领取截止时间 = false
@@ -1296,7 +1302,7 @@ const doTaskReport = (req, sender) => {
     case 'like':
       event_type = 2
       state.done.like = req.task_done
-      // 
+      //
       if (!req.task_done && req.do_type == 'api') {
         window.open(`https://twitter.com/intent/like?tweet_id=${state.tweetId}`)
       }
@@ -2021,7 +2027,7 @@ function openInviteUrl() {
 }
 
 </script>
- 
+
 <style lang="scss" scoped>
 html,
 body {