From 7160c12ee6c5eb9ffbce1caea864110f3585c0e1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 17:29:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
apps/taro/src/hooks/user.ts | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index 3dd00bb..e651456 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -8,6 +8,7 @@
import { LoginFormTabs } from '@/subpackages/login/constants';
import { useLoginedJump } from './login';
import { useLifeRechargeContext, APIgetLifePayWxIndentityParams } from '@life-payment/core-vue';
+import { isInWeChat } from '@/utils/env';
export function useUser() {
const userStore = useUserStore();
@@ -57,6 +58,8 @@
const isAuth = computed(() => !needAuth || isLogin.value);
const router = Taro.useRouter();
+ console.log('222', 222);
+ useInitWeixinJSBridge();
Taro.useReady(async () => {
if (isLogin.value && userStore.firstGetUserDetail) {
@@ -83,29 +86,30 @@
const { blLifeRecharge } = useLifeRechargeContext();
Taro.useReady(async () => {
- if (!code && !!WeixinJSBridge && !wxCode) {
- location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf940ff1d35a98493&redirect_uri=${location.href}&response_type=code&scope=snsapi_base#wechat_redirect`;
- }
- if (!!code && !wxCode) {
- try {
+ try {
+ //@ts-ignore
+ if (!code && isInWeChat && !wxCode.value) {
+ location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf940ff1d35a98493&redirect_uri=${location.href}&response_type=code&scope=snsapi_base#wechat_redirect`;
+ }
+ if (!!code && !wxCode.value) {
userStore.setWxCode(router.params.code ?? '');
let res = await getLifePayWxIndentity();
userStore.setWxOpenId(res.openId);
- } catch (error) {}
- }
-
- async function getLifePayWxIndentity() {
- try {
- let params: APIgetLifePayWxIndentityParams = {
- code: code,
- };
- let res = await blLifeRecharge.services.getLifePayWxIndentity(params, {
- showLoading: false,
- });
- return res;
- } catch (error) {}
- }
+ }
+ } catch (error) {}
});
+
+ async function getLifePayWxIndentity() {
+ try {
+ let params: APIgetLifePayWxIndentityParams = {
+ code: code,
+ };
+ let res = await blLifeRecharge.services.getLifePayWxIndentity(params, {
+ showLoading: false,
+ });
+ return res;
+ } catch (error) {}
+ }
}
export function useGoLogin() {
--
Gitblit v1.9.1