SxhGroup / zheliResearchWap_province_zlb

Download as
Browse Code »

Commit 2c6e2be3a88aa656764315c748483cf86afcfd4a

Authored by 夏洋涛
1 parent 63c34a5d
Exists in master

fix:登录逻辑问题修改

Showing 2 changed files with 40 additions and 21 deletions   Show diff stats
src/App.vue
  Diff comments   View file @2c6e2be
... ... @@ -19,12 +19,18 @@ export default {
19 19 },
20 20 watch: {
21 21 $route(to, from) {
22   - console.log('zheliban 》》》 ', to, from)
23   - this.$zwlogPvGlobal({ url: to.meta.pagePath, enterPageTime: new Date() })
24   - this.$zwlogPvGlobal({
25   - url: from.meta.pagePath,
26   - leavePageTime: new Date(),
27   - })
  22 + let centerNo = localStorage.getItem('centerNo')
  23 + if(centerNo){
  24 + console.log('zheliban hasUserId》》》 ', to, from)
  25 + this.$zwlogPvGlobal({ url: to.meta.pagePath, enterPageTime: new Date() })
  26 + this.$zwlogPvGlobal({
  27 + url: from.meta.pagePath,
  28 + leavePageTime: new Date(),
  29 + })
  30 +
  31 + }else{
  32 + console.log('zheliban noUserId》》》 ', to, from)
  33 + }
28 34 },
29 35 },
30 36 mounted() {
... ...
src/views/Home.vue
  Diff comments   View file @2c6e2be
... ... @@ -160,11 +160,6 @@ export default {
160 160 title: '绍兴研学',
161 161 })
162 162 })
163   -
164   - this.$zwlogPvGlobal({ loadTime: new Date() })
165   - this.$nextTick(() => {
166   - this.$zwlogPvGlobal({ responseTime: new Date() })
167   - })
168 163 this.checkAuth()
169 164 //二次回退
170 165 const sUserAgent = window.navigator.userAgent.toLowerCase()
... ... @@ -192,27 +187,41 @@ export default {
192 187 listenerPopstate() {
193 188 ZWJSBridge.close()
194 189 },
  190 + maidian() {
  191 + if (this.centerNo) {
  192 + this.$zwlogPvGlobal({ loadTime: new Date() })
  193 + this.$nextTick(() => {
  194 + this.$zwlogPvGlobal({ responseTime: new Date() })
  195 + })
  196 + }
  197 + },
195 198 checkAuth() {
196 199 let centerNo = localStorage.getItem('centerNo')
197 200 let centerNoTime = localStorage.getItem('centerNoTime')
198 201 let nowTime = new Date().getTime()
  202 + // alert(centerNo+'-'+nowTime + '-' + centerNoTime + '=' + (nowTime - centerNoTime))
199 203 // 超过10分钟重新授权获取
200   - if(!centerNoTime||nowTime-centerNoTime>600000){
  204 + if (!centerNoTime || nowTime - centerNoTime > 600000) {
201 205 centerNo = ''
202 206 }
203   - console.log(nowTime-centerNoTime)
204 207 let ticket = this.common.getUrlParam('ticket') //浙里办app访问
205 208 let ticketId = this.common.getUrlParam('ticketId') //浙里办微信小程序访问
206   - // alert(location.href)
207   - // alert(ticketId)
208 209 if (centerNo) {
209   - // alert('有中台编号：' + centerNo)
  210 + // ZWJSBridge.alert({
  211 + // message: '有中台编号：' + centerNo,
  212 + // })
210 213 this.centerNo = centerNo
  214 + this.maidian()
211 215 this.getUserInfo()
212   - } else if (ticket) {
  216 + } else if (ticket && ticket.indexOf('debug') == -1) {
  217 + // ZWJSBridge.alert({
  218 + // message: '有ticket：' + ticket,
  219 + // })
213 220 this.getCenterByTicket(ticket)
214   - } else if (ticketId) {
215   - // alert('getCenterByTicketId')
  221 + } else if (ticketId && ticketId.indexOf('debug') == -1) {
  222 + // ZWJSBridge.alert({
  223 + // message: '有ticketId：' + ticketId,
  224 + // })
216 225 this.getCenterByTicketId(ticketId)
217 226 localStorage.setItem('isWechat', 1)
218 227 } else {
... ... @@ -243,7 +252,10 @@ export default {
243 252 console.log('通过ticket获取centerNo成功:', res)
244 253 if (res.data.code == 200) {
245 254 this.centerNo = res.data.message
  255 + this.maidian()
246 256 localStorage.setItem('centerNo', res.data.message)
  257 + let nowTime = new Date().getTime()
  258 + localStorage.setItem('centerNoTime', nowTime)
247 259 this.getUserInfo()
248 260 } else {
249 261 this.reLoad()
... ... @@ -256,7 +268,10 @@ export default {
256 268 console.log('通过ticket获取centerNo成功:', res)
257 269 if (res.data.code == 200) {
258 270 this.centerNo = res.data.message
  271 + this.maidian()
259 272 localStorage.setItem('centerNo', res.data.message)
  273 + let nowTime = new Date().getTime()
  274 + localStorage.setItem('centerNoTime', nowTime)
260 275 this.getUserInfo()
261 276 } else {
262 277 this.reLoad()
... ... @@ -296,8 +311,6 @@ export default {
296 311 },
297 312 // 获取用户信息
298 313 getUserInfo() {
299   - this.centerNo = localStorage.getItem('centerNo')
300   - // alert('getUserInfo:' + this.centerNo)
301 314 this.yxAxios.get(`${this.proxyUrl}/user/info/getPortalUserByNum?userNum=${localStorage.getItem('centerNo')}`).then((res) => {
302 315 console.log('获取用户信息getPortalUserByNum:', res)
303 316 if (res.data.code == 200) {
... ...