From e0955038d27e6ecde44da9892502be96e8182d13 Mon Sep 17 00:00:00 2001 From: aixianling Date: Mon, 20 Mar 2023 16:56:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/utils/modules.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js index 43af3b8..9860740 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}) { //用于进入应用的权限判断 From 49d43d14e64fa7f5b195e2452623bb2a90dff4a2 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 20 Mar 2023 17:21:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/utils/modules.js | 16 +++++++++++----- src/project/fengdu/AppMine/AppMine.vue | 13 +++++++------ src/project/fengdu/AppMine/userInfo.vue | 3 ++- .../fengdu/AppWxworkQrcode/AppWxworkQrcode.vue | 2 +- 4 files changed, 21 insertions(+), 13 deletions(-) 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 @@
-
请选择居民群
+
请选择社群加入群聊
From 089e9933088c3a480153f1d8436f869621096ae6 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Mon, 20 Mar 2023 17:27:14 +0800 Subject: [PATCH 3/3] bug127 --- src/project/fengdu/AppHome/AppHome.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@
- - + +