diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php index 24fad4bbc..76a24c935 100644 --- a/crmeb/crmeb/services/app/WechatService.php +++ b/crmeb/crmeb/services/app/WechatService.php @@ -57,13 +57,7 @@ class WechatService $appId = isset($wechat['wechat_app_appid']) ? trim($wechat['wechat_app_appid']) : ''; $appsecret = isset($wechat['wechat_app_appsecret']) ? trim($wechat['wechat_app_appsecret']) : ''; } else { - $appId = null; - if (request()->isPc()) { - $appId = sys_config('wechat_open_app_id'); - } - if (!$appId) { - $appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : ''; - } + $appId = isset($wechat['wechat_appid']) ? trim($wechat['wechat_appid']) : ''; $appsecret = isset($wechat['wechat_appsecret']) ? trim($wechat['wechat_appsecret']) : ''; } $config = [ diff --git a/template/admin/src/layout/navBars/breadcrumb/user.vue b/template/admin/src/layout/navBars/breadcrumb/user.vue index de16e8fcd..dde1d1f9c 100644 --- a/template/admin/src/layout/navBars/breadcrumb/user.vue +++ b/template/admin/src/layout/navBars/breadcrumb/user.vue @@ -198,12 +198,15 @@ export default { instance.confirmButtonLoading = true; instance.confirmButtonText = this.$t('message.user.logOutExit'); AccountLogout().then((res) => { - this.$Message.success('您已成功退出'); - this.$router.replace({ path: `${settings.routePre}/login` }); + this.$router.replace({ name: 'login' }); + this.$store.commit('clearAll'); + localStorage.clear(); + sessionStorage.clear(); removeCookies('token'); removeCookies('expires_time'); removeCookies('uuid'); - // window.location.reload() + this.$Message.success('您已成功退出'); + // this.$router.replace({ path: `${settings.routePre}/login` }); done(); setTimeout(() => { instance.confirmButtonLoading = false; diff --git a/template/admin/src/pages/kefu/mobile/chat_list.vue b/template/admin/src/pages/kefu/mobile/chat_list.vue index fa691c710..ff0081625 100644 --- a/template/admin/src/pages/kefu/mobile/chat_list.vue +++ b/template/admin/src/pages/kefu/mobile/chat_list.vue @@ -331,8 +331,14 @@ export default { }, }; - +