zoujing/YGChatCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 登录的优化调整

Browse Source
This commit is contained in:
zoujing
2026-01-06 16:15:46 +08:00
parent 71a1083887
commit 7e02429f6e
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/hooks/useGoLogin.js
View File

@@ -1,7 +1,6 @@
import { wxLogin, checkUserPhone } from "@/request/api/LoginApi"; import { wxLogin, checkUserPhone } from "@/request/api/LoginApi";
import { loginAuth, bindPhone } from "@/manager/LoginManager"; import { loginAuth, bindPhone } from "@/manager/LoginManager";
import { clientId } from "@/constant/base"; import { clientId } from "@/constant/base";
import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
import { getAccessToken, setAccessToken } from "../constant/token"; import { getAccessToken, setAccessToken } from "../constant/token";
// 跳转登录 // 跳转登录
@@ -88,8 +87,6 @@ export const refreshToken = (needLogin = false) => {
}); });
if (checkRes.data) { if (checkRes.data) {
// 登录成功后，触发登录成功事件
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
resolve(false); resolve(false);
} else { } else {
resolve(true); resolve(true);

16
src/pages/login/index.vue
View File

@@ -28,7 +28,7 @@
<!-- 按钮区域 --> <!-- 按钮区域 -->
<view class="login-btn-area"> <view class="login-btn-area">
<!-- 同意隐私协议并获取手机号按钮 --> <!-- 同意隐私协议并获取手机号按钮 -->
<button v-if="needWxLogin" class="login-btn" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> <button v-if="needWxAuthLogin" class="login-btn" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
手机号快捷登录 手机号快捷登录
</button> </button>
<button v-else class="login-btn" type="primary" @click="handleAgreeAndGetPhone"> <button v-else class="login-btn" type="primary" @click="handleAgreeAndGetPhone">
@@ -52,8 +52,10 @@ import CheckBox from "@/components/CheckBox/index.vue";
import AgreePopup from "./components/AgreePopup/index.vue"; import AgreePopup from "./components/AgreePopup/index.vue";
import { zniconsMap } from "@/static/fonts/znicons"; import { zniconsMap } from "@/static/fonts/znicons";
import { getCurrentConfig } from "@/constant/base"; import { getCurrentConfig } from "@/constant/base";
import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
const needWxLogin = ref(false); // 是否需要微信手机号授权登录
const needWxAuthLogin = ref(false);
const isAgree = ref(false); const isAgree = ref(false);
const visible = ref(false); const visible = ref(false);
const serviceAgreement = ref(""); const serviceAgreement = ref("");
@@ -65,7 +67,7 @@ const logo = computed(() => getCurrentConfig().logo);
// 同意隐私协议并获取手机号 // 同意隐私协议并获取手机号
const handleAgreeAndGetPhone = () => { const handleAgreeAndGetPhone = () => {
// 如果需要微信登录，直接返回 // 如果需要微信登录，直接返回
if (needWxLogin.value) { if (needWxAuthLogin.value) {
return; return;
} }
@@ -95,11 +97,15 @@ const getPhoneNumber = (e) => {
/// 登录成功返回上一页 /// 登录成功返回上一页
const loginSuccess = () => { const loginSuccess = () => {
// 登录成功后，触发登录成功事件
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
uni.showToast({ uni.showToast({
title: "登录成功", title: "登录成功",
icon: "success", icon: "success",
}); });
goBack(); setTimeout(() => {
goBack();
}, 500);
}; };
// 处理同意协议点击事件 // 处理同意协议点击事件
@@ -134,7 +140,7 @@ getPrivacyAgreementData();
// 页面显示时刷新token // 页面显示时刷新token
onShow(async () => { onShow(async () => {
const res = await refreshToken(); const res = await refreshToken();
needWxLogin.value = res; needWxAuthLogin.value = res;
}); });