From 9ab42b4fb5b38a3d8380ed2c27533a1e6111719a Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 10 Mar 2020 16:37:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=201.=20=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E5=88=A4=E6=96=AD=E9=94=99?= =?UTF-8?q?=E8=AF=AF=202.=E6=9E=81=E9=80=9F=E7=99=BB=E5=BD=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/auth/auth.vue | 4 ++++ main.js | 2 +- pages/user-code/user-code.vue | 8 ++++---- store/modules/user/actions.js | 3 ++- store/modules/user/mutations.js | 10 +++++----- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/components/auth/auth.vue b/components/auth/auth.vue index 9e239d5..bfa0b3c 100644 --- a/components/auth/auth.vue +++ b/components/auth/auth.vue @@ -34,7 +34,11 @@ export default { if (value) { if (!value.wxInfo || !value.wxInfo.nickname) { this.show = true; + } else { + this.show = false; } + } else { + this.show = false; } }, }, diff --git a/main.js b/main.js index c057d11..f6b4950 100644 --- a/main.js +++ b/main.js @@ -39,7 +39,7 @@ Vue.prototype.openPage = function(path, query = '') { let url = query ? `${path}?${query}` : path; store.commit('user/setPagePath', url); const isWhite = checkWhitePath(url); - if (!store.state.user.userInfo.id && !isWhite) { + if ((!store.state.user.userInfo || !store.state.user.userInfo.id) && !isWhite) { url = '/pages/basic-info/basic-info'; } diff --git a/pages/user-code/user-code.vue b/pages/user-code/user-code.vue index 74bc90e..be70907 100644 --- a/pages/user-code/user-code.vue +++ b/pages/user-code/user-code.vue @@ -94,9 +94,9 @@ export default { // 健康状态 登记 level() { - if (!this.userInfo || !this.userInfo.healthLevel) return '正常'; + if (!this.userInfo || !this.userInfo.healthCodeList) return '正常'; let str = '正常'; - switch (this.userInfo.healthLevel[0].healthLevel) { + switch (this.userInfo.healthCodeList[0].healthLevel) { case 0: str = '正常'; break; @@ -113,8 +113,8 @@ export default { }, time() { - if (!this.userInfo || !this.userInfo.healthLevel) return; - return this.$moment(this.userInfo.healthLevel[0].time - 0).format('YYYY-MM-DD HH:mm'); + if (!this.userInfo || !this.userInfo.healthCodeList) return; + return this.$moment(this.userInfo.healthCodeList[0].time - 0).format('YYYY-MM-DD HH:mm'); }, }, diff --git a/store/modules/user/actions.js b/store/modules/user/actions.js index 3ae698e..0024847 100644 --- a/store/modules/user/actions.js +++ b/store/modules/user/actions.js @@ -52,7 +52,7 @@ const actions = { .post(UPDATE_USER, params) .then(res => { const { data } = res.data; - commit('updateUser', { type: 'wxInfo', params }); + commit('updateUser', { type: 'wxInfo', value: params }); resolve(data); }) .catch(data => { @@ -75,6 +75,7 @@ const actions = { .then(res => { hideLoading(); const { data } = res.data; + console.log('getUserInfo data: ', data); resolve(data); // 获取自己的信息采取设置 // 扫别人健康码的时候不用设置 diff --git a/store/modules/user/mutations.js b/store/modules/user/mutations.js index 3da99aa..562cf76 100644 --- a/store/modules/user/mutations.js +++ b/store/modules/user/mutations.js @@ -34,7 +34,7 @@ const mutations = { state.user = { ...user }; uni.setStorageSync('user', JSON.stringify(user)); }, - + /** * 设置健康码 * @param {object} state @@ -43,7 +43,7 @@ const mutations = { setHealthCode(state, data) { state.healthCode = data; }, - + /** * 设置个人信息 userInfo * @param {*} state @@ -52,7 +52,7 @@ const mutations = { setUserInfo(state, data) { state.userInfo = data; }, - + /** * 设置页面跳转参数 pagePath * @param {*} state @@ -61,7 +61,7 @@ const mutations = { setPagePath(state, data) { state.pagePath = data; }, - + /** * 设置健康状态类型 status * @param {*} state @@ -69,7 +69,7 @@ const mutations = { */ setStatus(state, data) { state.status = data || []; - } + }, }; export default mutations;