fix:登录逻辑问题修改

夏洋涛
1 parent 63c34a5d
Showing 2 changed files with 40 additions and 21 deletions Show diff stats
src/App.vue
src/views/Home.vue
@@ -19,12 +19,18 @@ export default {
   },
   watch: {
     $route(to, from) {
-      console.log('zheliban 》》》 ', to, from)
-      this.$zwlogPvGlobal({ url: to.meta.pagePath, enterPageTime: new Date() })
-      this.$zwlogPvGlobal({
-        url: from.meta.pagePath,
-        leavePageTime: new Date(),
-      })
+      let centerNo = localStorage.getItem('centerNo')
+      if(centerNo){
+      console.log('zheliban hasUserId》》》 ', to, from)
+        this.$zwlogPvGlobal({ url: to.meta.pagePath, enterPageTime: new Date() })
+        this.$zwlogPvGlobal({
+          url: from.meta.pagePath,
+          leavePageTime: new Date(),
+        })
+
+      }else{
+      console.log('zheliban noUserId》》》 ', to, from)
+      }
     },
   },
   mounted() {
@@ -160,11 +160,6 @@ export default {
         title: '绍兴研学',
       })
     })
-
-    this.$zwlogPvGlobal({ loadTime: new Date() })
-    this.$nextTick(() => {
-      this.$zwlogPvGlobal({ responseTime: new Date() })
-    })
     this.checkAuth()
     //二次回退
     const sUserAgent = window.navigator.userAgent.toLowerCase()
@@ -192,27 +187,41 @@ export default {
     listenerPopstate() {
       ZWJSBridge.close()
     },
+    maidian() {
+      if (this.centerNo) {
+        this.$zwlogPvGlobal({ loadTime: new Date() })
+        this.$nextTick(() => {
+          this.$zwlogPvGlobal({ responseTime: new Date() })
+        })
+      }
+    },
     checkAuth() {
       let centerNo = localStorage.getItem('centerNo')
       let centerNoTime = localStorage.getItem('centerNoTime')
       let nowTime = new Date().getTime()
+      // alert(centerNo+'-'+nowTime + '-' + centerNoTime + '=' + (nowTime - centerNoTime))
       // 超过10分钟重新授权获取
-      if(!centerNoTime||nowTime-centerNoTime>600000){
+      if (!centerNoTime || nowTime - centerNoTime > 600000) {
         centerNo = ''
       }
-      console.log(nowTime-centerNoTime)
       let ticket = this.common.getUrlParam('ticket') //浙里办app访问
       let ticketId = this.common.getUrlParam('ticketId') //浙里办微信小程序访问
-      // alert(location.href)
-      // alert(ticketId)
       if (centerNo) {
-        // alert('有中台编号：' + centerNo)
+        // ZWJSBridge.alert({
+        //   message: '有中台编号：' + centerNo,
+        // })
         this.centerNo = centerNo
+        this.maidian()
         this.getUserInfo()
-      } else if (ticket) {
+      } else if (ticket && ticket.indexOf('debug') == -1) {
+        // ZWJSBridge.alert({
+        //   message: '有ticket：' + ticket,
+        // })
         this.getCenterByTicket(ticket)
-      } else if (ticketId) {
-        // alert('getCenterByTicketId')
+      } else if (ticketId && ticketId.indexOf('debug') == -1) {
+        // ZWJSBridge.alert({
+        //   message: '有ticketId：' + ticketId,
+        // })
         this.getCenterByTicketId(ticketId)
         localStorage.setItem('isWechat', 1)
       } else {
@@ -243,7 +252,10 @@ export default {
         console.log('通过ticket获取centerNo成功:', res)
         if (res.data.code == 200) {
           this.centerNo = res.data.message
+          this.maidian()
           localStorage.setItem('centerNo', res.data.message)
+          let nowTime = new Date().getTime()
+          localStorage.setItem('centerNoTime', nowTime)
           this.getUserInfo()
         } else {
           this.reLoad()
@@ -256,7 +268,10 @@ export default {
         console.log('通过ticket获取centerNo成功:', res)
         if (res.data.code == 200) {
           this.centerNo = res.data.message
+          this.maidian()
           localStorage.setItem('centerNo', res.data.message)
+          let nowTime = new Date().getTime()
+          localStorage.setItem('centerNoTime', nowTime)
           this.getUserInfo()
         } else {
           this.reLoad()
@@ -296,8 +311,6 @@ export default {
     },
     // 获取用户信息
     getUserInfo() {
-      this.centerNo = localStorage.getItem('centerNo')
-      // alert('getUserInfo:' + this.centerNo)
       this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${localStorage.getItem('centerNo')}`).then((res) => {
         console.log('获取用户信息getPortalUserByNum:', res)
         if (res.data.code == 200) {