From 2f217e8dc1168dfc3f0f87110614918fd08e249a Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Jun 2024 17:59:10 +0800
Subject: [PATCH] =?UTF-8?q?Feat(=E9=A1=B5=E9=9D=A2):=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E6=AC=A1=E6=95=B0=E5=92=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=81=9C=E7=95=99=E6=97=B6=E9=95=BF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mixins/pageListenMixins.js |  4 ++--
 utils/util.js              | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/mixins/pageListenMixins.js b/mixins/pageListenMixins.js
index 6fd42d7..b0dabe1 100644
--- a/mixins/pageListenMixins.js
+++ b/mixins/pageListenMixins.js
@@ -15,12 +15,12 @@ export const pageListenMixins = {
     this.pageToWatchShowCount(this.pageKeyId)
   },
   onHide() {
-    this.clearPageTimerFn()
+    this.pageToHideHandle()
   },
 	methods: {
 		pageToWatchShowCount,
 		pageToWatchShowTimer,
-    clearPageTimerFn() {
+    pageToHideHandle() {
       const visitTime = TimeDifference(this.pageViewDateTime, getCurrDateTime())
       if (visitTime > 0) {
         this.pageToWatchShowTimer(this.pageKeyId, {
diff --git a/utils/util.js b/utils/util.js
index b54d61d..de312fe 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -111,31 +111,39 @@ export function clearAllInterval() {
   for (let i = 1; i <= endTimerId; i++) {
     clearInterval(i)
   }
-  pushSysByOneMinutesHandle()
+  pushSysBySecondsHandle()
 }
 
 /**
  * 定时推送埋点
  * @returns {null}
  */
-function pushSysByOneMinutesHandle() {
+function pushSysBySecondsHandle() {
   setInterval(() => {
+    const userInfo = uni.getStorageSync('userInfo')
+    if (!userInfo) {
+      return
+    }
     let statsData = []
     for (const key in Vue.prototype.$pageToWatchData) {
       if (Vue.prototype.$pageToWatchData[key]) {
-        console.log(Vue.prototype.$pageToWatchData[key])
         statsData = statsData.concat(Vue.prototype.$pageToWatchData[key])
       }
     }
-    console.log(statsData)
+    // 设备类型phone、pad、pc、unknow
+    const deviceType = uni.getSystemInfoSync().deviceType
+    // 系统名称ios、android
+    const osName = uni.getSystemInfoSync().osName
+    console.log(deviceType)
+    console.log(osName)
     const postData = {
-      uid: '',
-      deviceType: 'android',
+      uid: userInfo.uid,
+      deviceType: deviceType === 'phone' ? osName : 'unknown',
       statsData
     }
     console.log('开始上报数据-------------------')
     pushSystemStatic(postData).catch(err => {
       console.log(err)
     })
-  }, 60 * 1000)
+  }, 30 * 1000)
 }