diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js index 2fea4da..b793259 100644 --- a/src/components/utils/modules.js +++ b/src/components/utils/modules.js @@ -62,7 +62,8 @@ export const user = { } else return Promise.reject("缺少登录code") }, autoLogin({dispatch}, params = {nickName: '微信用户'}) { - return dispatch("getCode").then(code => dispatch("getToken", {...params, code})).then(() => dispatch('getUserInfo')) + const {loginWay = 'std'} = params + return dispatch("getCode").then(code => dispatch("getToken", {...params, code})).then(() => dispatch('getUserInfo', loginWay)) }, authCheck({state, dispatch, rootState}, {checkType, modulePath}) { //用于进入应用的权限判断 @@ -99,12 +100,18 @@ export const user = { return dispatch('autoLogin').then(() => dispatch('authCheck', { checkType, modulePath })); } if (!userInfo.areaId) { - this.$dialog.confirm({ + return uni.showModal({ + title: '温馨提示', content: '您只有完成信息认证后,才可进行相关操作。', - confirmText: '去认证' - }).then(() => { - uni.switchTab({ url: '/pages/AppMine/userInfo' }) - }).catch(() => { + confirmText: '去认证', + success: (res)=> { + if (res.confirm) { + // console.log('用户点击确定'); + uni.switchTab({ url: '/pages/AppMine/userInfo' }) + } else if (res.cancel) { + // console.log('用户点击取消'); + } + } }) } } diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue index a0704eb..e055efd 100644 --- a/src/project/fengdu/AppHome/AppHome.vue +++ b/src/project/fengdu/AppHome/AppHome.vue @@ -23,8 +23,8 @@
-
+
+