diff --git a/app.js b/app.js index 06ccf9d..04dabf5 100644 --- a/app.js +++ b/app.js @@ -13,8 +13,9 @@ App({ // wx.setStorageSync('logs', logs) let userInfo = wx.getStorageSync('userinfo'); let openId = wx.getStorageSync('openId') || ''; + let needReload = wx.getStorageSync('reload-userinfo'); this.globalData.openId = openId - if (userInfo) { + if (!needReload && userInfo) { this.globalData.userInfo = userInfo; return; } @@ -91,8 +92,10 @@ App({ try { let openid = this.globalData.openId; let userInfo = await api.userInfo(openid, false); + wx.removeStorageSync('reload-userinfo') console.log('init user info data', userInfo); this.globalData.userInfo = userInfo; + wx.setStorageSync('userinfo', userInfo) } catch (e) { console.log('init user info error', e); } diff --git a/pages/index/index.js b/pages/index/index.js index 8650fd0..f746026 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -7,6 +7,12 @@ import api from './../../utils/api.js'; Page({ data: { motto: 'Hello', + levels:[ + '没有高反', + '轻度高反', + '中度高反', + '重度高反' + ], userInfo: { avatarUrl: '/assets/head.svg', realname: '张二娃', @@ -84,8 +90,9 @@ Page({ async processGetUserInfo(userInfo) { // if (app.globalData.userInfo) { // 已经存在数据则直接跳过 + let userInfo = app.globalData.userInfo; this.setData({ - userInfo: app.globalData.userInfo, + userInfo: userInfo, hasUserInfo: true }); return; @@ -104,7 +111,16 @@ Page({ hasUserInfo: true }); return; - }catch(e){} + }catch(e){ + if (e['errMsg'] && e.errMsg.trim() == 'request:fail'){ + wx.showModal({ + title: '获取数据失败', + showCancel:false + }) + return; + } + console.log('get user info error',e); + } try { let data = await api.createUserInfo({ open_id: app.globalData.openId, @@ -112,6 +128,7 @@ Page({ username: app.globalData.openId, avatarUrl: userInfo.avatarUrl, }); + wx.setStorageSync('userinfo', data) // 保存数据 app.globalData.userInfo = data; this.setData({ @@ -124,7 +141,6 @@ Page({ } // 判断是否需要跳转 if (this.data.userInfo.detail) { return; } - this.gotoAgreementPage() }, gotoAgreementPage() { @@ -149,5 +165,18 @@ Page({ } else { this.gotoAgreementPage() } + }, + async onShow(){ + if (wx.getStorageSync('refresh-userinfo')) { + wx.removeStorageSync('refresh-userinfo'); + + let userInfo = await api.userInfo(null, false); + app.globalData.userInfo = userInfo; + wx.setStorageSync('userinfo', userInfo) + this.setData({ + userInfo: userInfo, + hasUserInfo: true + }); + } } }) \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ea580b2..d88ea04 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,17 +4,22 @@ - - {{userInfo.realname}} + - 评估时间:{{userInfo.lastEvaluation?userInfo.lastEvaluation:'还没有评估过'}} + 评估时间: + {{userInfo.lastEvaluation?userInfo.lastEvaluation:'还没有评估过'}} - + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 450c689..b733ea4 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -25,4 +25,31 @@ } .user-info{ border-bottom: solid 1px #efefef; +} +.user-info-header{ + position: relative; +} +.text-nickname{ + font-size: 40rpx; +} +.last-evaluation{ + font-size: 24rpx; + background:#259B24; + color:#fff; + margin-left:20rpx; + border-radius: 8rpx; + padding:0rpx 8rpx; +} +.last-evaluation.level-0{ + background:#fff; + color:#999; +} +.last-evaluation.level-1{ + background-color: #259b24; +} +.last-evaluation.level-2{ + background-color: #ff9800; +} +.last-evaluation.level-3{ + background-color: #e51c23; } \ No newline at end of file diff --git a/pages/user/index.js b/pages/user/index.js index 43478e7..0836308 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -127,6 +127,8 @@ Page({ data[key] = value await api.updateUserDetail(data) this.setUserDetail(key,value); + + wx.setStorageSync('refresh-userinfo', true) }catch(e){ console.log('update error',e); } diff --git a/pages/user/result.js b/pages/user/result.js index 96ca426..b055659 100644 --- a/pages/user/result.js +++ b/pages/user/result.js @@ -1,5 +1,6 @@ // pages/user/result.js -import {queryEvaluationById} from './../../utils/api.js'; +import api,{queryEvaluationById} from './../../utils/api.js'; +const app = getApp(); Page({ /** @@ -18,6 +19,13 @@ Page({ this.setData({ item:data }) + + wx.setStorageSync('refresh-userinfo', true) + // try { + // } catch (e) { + // wx.setStorageSync('reload-userinfo', true) + // console.log('update user info error', e); + // } }, /** @@ -31,7 +39,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - + }, /**