diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js index 1ea8efb..b793259 100644 --- a/src/components/utils/modules.js +++ b/src/components/utils/modules.js @@ -100,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/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue index 0c6e9aa..19b3a97 100644 --- a/src/project/fengdu/AppMine/AppMine.vue +++ b/src/project/fengdu/AppMine/AppMine.vue @@ -24,10 +24,10 @@ -
+
- +
@@ -65,9 +65,7 @@ export default { return this.user?.status == 2; }, approveLabel() { - return this.user?.status == 2 ? "已认证" : - this.user?.status == 1 ? "审核中" : - this.user?.status == -1 ? "审核驳回" : "前往认证" + return this.user?.status == 2 ? "已认证" : "前往认证" }, listGroup() { return [ @@ -180,8 +178,11 @@ export default { }) }, }, - onShow() { + onLoad() { this.getAuth(); + uni.$on('auth',()=> { + this.getAuth(); + }) }, onShareAppMessage() { return { diff --git a/src/project/fengdu/AppMine/userInfo.vue b/src/project/fengdu/AppMine/userInfo.vue index bf84a1c..5ca0d33 100644 --- a/src/project/fengdu/AppMine/userInfo.vue +++ b/src/project/fengdu/AppMine/userInfo.vue @@ -152,7 +152,8 @@ export default { }).then(res=> { if(res?.code==0) { this.$u.toast('提交成功') - this.autoLogin() + this.autoLogin({ loginWay:'qujing'}) + uni.$emit('auth') setTimeout(() => { uni.navigateBack() }, 600); diff --git a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue index a1e848e..9e2da33 100644 --- a/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue +++ b/src/project/fengdu/AppWxworkQrcode/AppWxworkQrcode.vue @@ -10,7 +10,7 @@
-
请选择居民群
+
请选择社群加入群聊