6 Commits

Author SHA1 Message Date
DEV_DSW
3e18c99161 feat: 快速预定新增未登录检测拦截 2025-12-29 17:26:46 +08:00
duanshuwen
6745e36a79 feat: 登录逻辑调整 2025-12-27 23:20:21 +08:00
duanshuwen
56ad450731 feat: 登录逻辑调整 2025-12-27 22:49:14 +08:00
duanshuwen
ea56695099 feat: 登录异常问题调整 2025-12-26 22:59:44 +08:00
duanshuwen
dfadb06934 feat: 登录逻辑问题调整 2025-12-25 23:04:51 +08:00
duanshuwen
f027685072 feat: 调整登录逻辑 2025-12-25 22:45:55 +08:00
15 changed files with 212 additions and 264 deletions

View File

@@ -1,5 +1,5 @@
{ {
"appid": "wx5e79df5996572539", "appid": "wx23f86d809ae80259",
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "3.8.10", "libVersion": "3.8.10",
"packOptions": { "packOptions": {

View File

@@ -2,10 +2,16 @@
import { onLaunch, onShow, onHide } from "@dcloudio/uni-app"; import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
import { getEvnUrl } from "@/request/api/config"; import { getEvnUrl } from "@/request/api/config";
import { refreshToken } from "@/hooks/useGoLogin"; import { refreshToken } from "@/hooks/useGoLogin";
import { getAccessToken } from "@/constant/token";
onLaunch(async () => { onLaunch(async () => {
await getEvnUrl({ versionValue: "1.0.3" }); await getEvnUrl({ versionValue: "1.0.3" });
const token = getAccessToken();
if (token) {
refreshToken(); refreshToken();
}
}); });
onShow(() => { onShow(() => {

View File

@@ -12,7 +12,7 @@ import rawConfigs from '../../client-configs.json' with { type: 'json' };
export const CLIENT_CONFIGS = rawConfigs; export const CLIENT_CONFIGS = rawConfigs;
// 获取当前用户端配置 // 获取当前用户端配置
export const getCurrentConfig = () => CLIENT_CONFIGS.zhinian; export const getCurrentConfig = () => CLIENT_CONFIGS.duohua;
export const clientId = getCurrentConfig().clientId; export const clientId = getCurrentConfig().clientId;
export const appId = getCurrentConfig().appId; export const appId = getCurrentConfig().appId;

View File

@@ -1,19 +1,35 @@
import { appId, clientId } from "@/constant/base"; import { currentClientType } from "@/constant/base";
/// 存储在本地的认证 token 键名 // 存储在本地的认证 token 键名
export const clientAuthToken = "AUTH_TOKEN_" + clientId + "_" + appId; const CLIENT_TYPE = currentClientType();
const ACCESS_TOKEN = `${CLIENT_TYPE}_ACCESS_TOKEN`;
const REFRESH_ACCESS_TOKEN = `${CLIENT_TYPE}_REFRESH_ACCESS_TOKEN`;
/// 设置本地存储的认证 token // 设置本地存储的认证 token
export const setStorageSyncToken = (token) => { export const setAccessToken = (token) => {
uni.setStorageSync(clientAuthToken, token); return uni.setStorageSync(ACCESS_TOKEN, token);
}; };
/// 获取本地存储的认证 token // 设置本地存储的刷新 token
export const getStorageSyncToken = () => { export const setRefreshToken = (token) => {
return uni.getStorageSync(clientAuthToken); return uni.setStorageSync(REFRESH_ACCESS_TOKEN, token);
}; };
/// 移除本地存储的认证 token // 获取本地存储的刷新 token
export const removeStorageSyncToken = () => { export const getRefreshToken = () => {
uni.setStorageSync(clientAuthToken, ""); return uni.getStorageSync(REFRESH_ACCESS_TOKEN);
};
// 获取本地存储的认证 token
export const getAccessToken = () => {
return uni.getStorageSync(ACCESS_TOKEN);
};
// 移除本地存储的认证 token
export const removeAccessToken = () => {
return uni.removeStorageSync(ACCESS_TOKEN);
};
export const removeRefreshToken = () => {
return uni.removeStorageSync(REFRESH_ACCESS_TOKEN);
}; };

View File

@@ -1,8 +1,8 @@
import { wxLogin } from "../request/api/LoginApi"; import { wxLogin, checkUserPhone } from "@/request/api/LoginApi";
import { loginAuth, bindPhone, checkPhone } 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 { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
import { getStorageSyncToken, setStorageSyncToken } from "../constant/token"; import { getAccessToken, setAccessToken } from "../constant/token";
// 跳转登录 // 跳转登录
export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" }); export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
@@ -22,8 +22,9 @@ export const onLogin = async (e) => {
} }
await loginAuth(e).then(async () => { await loginAuth(e).then(async () => {
console.log("loginAuth resolve success");
// 检查手机号是否绑定 // 检查手机号是否绑定
const checkRes = await checkPhone(); const checkRes = await checkUserPhone();
if (checkRes.data) { if (checkRes.data) {
resolve(); resolve();
return; return;
@@ -48,7 +49,7 @@ export const onLogin = async (e) => {
// 检测token // 检测token
export const checkToken = () => { export const checkToken = () => {
const token = getStorageSyncToken(); const token = getAccessToken();
return new Promise((resolve) => { return new Promise((resolve) => {
if (!token) { if (!token) {
@@ -61,12 +62,12 @@ export const checkToken = () => {
}; };
// 刷新token // 刷新token
export const refreshToken = () => { export const refreshToken = (needLogin = false) => {
return new Promise((resolve) => { return new Promise(async (resolve) => {
uni.login({ uni.login({
provider: "weixin", //使用微信登录 provider: "weixin", //使用微信登录
success: async ({ code }) => { success: async ({ code }) => {
console.log("refreshToken", code); console.log("进入 refreshToken success", code);
const params = { const params = {
openIdCode: [code], openIdCode: [code],
grant_type: "wechat", grant_type: "wechat",
@@ -74,15 +75,25 @@ export const refreshToken = () => {
clientId: clientId, clientId: clientId,
}; };
console.log("获取到的微信授权params:", JSON.stringify(params)); console.log("获取到的微信授权params:", JSON.stringify(params));
const response = await wxLogin(params); const response = await wxLogin(params);
if (needLogin && response.access_token) {
setAccessToken(response.access_token);
}
if (response.access_token) { if (response.access_token) {
setStorageSyncToken(response.access_token); const checkRes = await checkUserPhone({
token: response.access_token,
});
if (checkRes.data) {
// 登录成功后,触发登录成功事件 // 登录成功后,触发登录成功事件
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS); uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
resolve(false) resolve(false);
} else { } else {
resolve(true) resolve(true);
}
} }
}, },
}); });

View File

@@ -1,17 +1,11 @@
import { import { wxLogin, bindUserPhone } from "../request/api/LoginApi";
wxLogin,
bindUserPhone,
checkUserPhone,
} from "../request/api/LoginApi";
import { getWeChatAuthCode } from "./AuthManager"; import { getWeChatAuthCode } from "./AuthManager";
import { useAppStore } from "@/store";
import { clientId } from "@/constant/base"; import { clientId } from "@/constant/base";
import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant"; import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
import { removeStorageSyncToken, setStorageSyncToken } from "../constant/token"; import { removeAccessToken, setAccessToken } from "../constant/token";
const loginAuth = (e) => { const loginAuth = (e) => {
removeStorageSyncToken(); removeAccessToken();
const appStore = useAppStore();
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const openIdCode = await getWeChatAuthCode(e); const openIdCode = await getWeChatAuthCode(e);
@@ -27,7 +21,9 @@ const loginAuth = (e) => {
console.log("获取到的微信授权response:", response); console.log("获取到的微信授权response:", response);
if (response.access_token) { if (response.access_token) {
setStorageSyncToken(response.access_token); console.log("进入条件");
setAccessToken(response.access_token);
// 登录成功后,触发登录成功事件 // 登录成功后,触发登录成功事件
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS); uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
resolve(); resolve();
@@ -46,9 +42,4 @@ const bindPhone = async (params) => {
} }
}; };
const checkPhone = async () => { export { loginAuth, bindPhone };
const response = await checkUserPhone();
return response;
};
export { loginAuth, bindPhone, checkPhone };

View File

@@ -60,7 +60,7 @@
wx23f86d809ae80259 wx23f86d809ae80259
*/ */
"mp-weixin": { "mp-weixin": {
"appid": "wx5e79df5996572539", "appid": "wx23f86d809ae80259",
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"minified": true "minified": true

View File

@@ -2,79 +2,42 @@
<view class="flex flex-col h-screen"> <view class="flex flex-col h-screen">
<!-- 顶部自定义导航栏 --> <!-- 顶部自定义导航栏 -->
<view class="header" :style="{ paddingTop: statusBarHeight + 'px' }"> <view class="header" :style="{ paddingTop: statusBarHeight + 'px' }">
<ChatTopNavBar <ChatTopNavBar ref="topNavBarRef" :mainPageDataModel="mainPageDataModel" />
ref="topNavBarRef"
:mainPageDataModel="mainPageDataModel"
/>
</view> </view>
<!-- 消息列表可滚动区域 --> <!-- 消息列表可滚动区域 -->
<scroll-view <scroll-view class="main flex-full overflow-hidden scroll-y" scroll-y :scroll-top="scrollTop"
class="main flex-full overflow-hidden scroll-y" :scroll-with-animation="true" @scroll="handleScroll" @scrolltolower="handleScrollToLower">
scroll-y
:scroll-top="scrollTop"
:scroll-with-animation="true"
@scroll="handleScroll"
@scrolltolower="handleScrollToLower"
>
<!-- welcome栏 --> <!-- welcome栏 -->
<ChatTopWelcome ref="welcomeRef" :mainPageDataModel="mainPageDataModel" /> <ChatTopWelcome ref="welcomeRef" :mainPageDataModel="mainPageDataModel" />
<view <view class="area-msg-list-content" v-for="item in chatMsgList" :key="item.msgId" :id="item.msgId">
class="area-msg-list-content"
v-for="item in chatMsgList"
:key="item.msgId"
:id="item.msgId"
>
<template v-if="item.msgType === MessageRole.AI"> <template v-if="item.msgType === MessageRole.AI">
<ChatCardAI <ChatCardAI class="flex flex-justify-start" :key="`ai-${item.msgId}-${item.msg ? item.msg.length : 0}`"
class="flex flex-justify-start" :text="item.msg || ''" :isLoading="item.isLoading">
:key="`ai-${item.msgId}-${item.msg ? item.msg.length : 0}`"
:text="item.msg || ''"
:isLoading="item.isLoading"
>
<template #content v-if="item.toolCall"> <template #content v-if="item.toolCall">
<QuickBookingComponent <QuickBookingComponent v-if="item.toolCall.componentName === CompName.quickBookingCard" />
v-if="item.toolCall.componentName === CompName.quickBookingCard" <DiscoveryCardComponent v-else-if="
/>
<DiscoveryCardComponent
v-else-if="
item.toolCall.componentName === CompName.discoveryCard item.toolCall.componentName === CompName.discoveryCard
" " />
/> <CreateServiceOrder v-else-if="
<CreateServiceOrder
v-else-if="
item.toolCall.componentName === CompName.callServiceCard item.toolCall.componentName === CompName.callServiceCard
" " :toolCall="item.toolCall" />
:toolCall="item.toolCall" <Feedback v-else-if="
/>
<Feedback
v-else-if="
item.toolCall.componentName === CompName.feedbackCard item.toolCall.componentName === CompName.feedbackCard
" " :toolCall="item.toolCall" />
:toolCall="item.toolCall" <DetailCardCompontent v-else-if="
/>
<DetailCardCompontent
v-else-if="
item.toolCall.componentName === item.toolCall.componentName ===
CompName.pictureAndCommodityCard CompName.pictureAndCommodityCard
" " :toolCall="item.toolCall" />
:toolCall="item.toolCall" <AddCarCrad v-else-if="
/>
<AddCarCrad
v-else-if="
item.toolCall.componentName === CompName.enterLicensePlateCard item.toolCall.componentName === CompName.enterLicensePlateCard
" " :toolCall="item.toolCall" />
:toolCall="item.toolCall"
/>
</template> </template>
<template #footer> <template #footer>
<!-- 这个是底部 --> <!-- 这个是底部 -->
<AttachListComponent <AttachListComponent v-if="item.question" :question="item.question" />
v-if="item.question"
:question="item.question"
/>
</template> </template>
</ChatCardAI> </ChatCardAI>
</template> </template>
@@ -85,21 +48,15 @@
<template v-else> <template v-else>
<ChatCardOther class="flex flex-justify-center" :text="item.msg"> <ChatCardOther class="flex flex-justify-center" :text="item.msg">
<ActivityListComponent <ActivityListComponent v-if="
v-if="
mainPageDataModel.activityList && mainPageDataModel.activityList &&
mainPageDataModel.activityList.length > 0 mainPageDataModel.activityList.length > 0
" " :activityList="mainPageDataModel.activityList" />
:activityList="mainPageDataModel.activityList"
/>
<RecommendPostsComponent <RecommendPostsComponent v-if="
v-if="
mainPageDataModel.recommendTheme && mainPageDataModel.recommendTheme &&
mainPageDataModel.recommendTheme.length > 0 mainPageDataModel.recommendTheme.length > 0
" " :recommendThemeList="mainPageDataModel.recommendTheme" />
:recommendThemeList="mainPageDataModel.recommendTheme"
/>
</ChatCardOther> </ChatCardOther>
</template> </template>
</view> </view>
@@ -108,17 +65,9 @@
<!-- 输入框区域 --> <!-- 输入框区域 -->
<view class="pb-safe-area"> <view class="pb-safe-area">
<ChatQuickAccess /> <ChatQuickAccess />
<ChatInputArea <ChatInputArea ref="inputAreaRef" v-model="inputMessage" :holdKeyboard="holdKeyboard"
ref="inputAreaRef" :is-session-active="isSessionActive" :stop-request="stopRequest" @send="sendMessageAction"
v-model="inputMessage" @noHideKeyboard="handleNoHideKeyboard" @keyboardShow="handleKeyboardShow" @keyboardHide="handleKeyboardHide" />
:holdKeyboard="holdKeyboard"
:is-session-active="isSessionActive"
:stop-request="stopRequest"
@send="sendMessageAction"
@noHideKeyboard="handleNoHideKeyboard"
@keyboardShow="handleKeyboardShow"
@keyboardHide="handleKeyboardHide"
/>
</view> </view>
</view> </view>
</template> </template>
@@ -159,7 +108,7 @@ import WebSocketManager from "@/utils/WebSocketManager";
import { ThrottleUtils, IdUtils } from "@/utils"; import { ThrottleUtils, IdUtils } from "@/utils";
import { checkToken } from "@/hooks/useGoLogin"; import { checkToken } from "@/hooks/useGoLogin";
import { useAppStore } from "@/store"; import { useAppStore } from "@/store";
import { getStorageSyncToken } from "@/constant/token"; import { getAccessToken } from "@/constant/token";
const appStore = useAppStore(); const appStore = useAppStore();
/// 导航栏相关 /// 导航栏相关
@@ -347,7 +296,7 @@ onLoad(() => {
// token存在初始化数据 // token存在初始化数据
const initHandler = () => { const initHandler = () => {
console.log("initHandler"); console.log("initHandler");
const token = getStorageSyncToken(); const token = getAccessToken();
if (!token) return; if (!token) return;
loadRecentConversation(); loadRecentConversation();
@@ -415,7 +364,7 @@ const initWebSocket = async () => {
} }
// 使用配置的WebSocket服务器地址 // 使用配置的WebSocket服务器地址
const token = getStorageSyncToken(); const token = getAccessToken();
const wsUrl = `${appStore.serverConfig.wssUrl}?access_token=${token}`; const wsUrl = `${appStore.serverConfig.wssUrl}?access_token=${token}`;
// 初始化WebSocket管理器 // 初始化WebSocket管理器

View File

@@ -1,13 +1,7 @@
<template> <template>
<view <view class="quick-access flex flex-row ml-12 pt-8 pb-8 scroll-x whitespace-nowrap">
class="quick-access flex flex-row ml-12 pt-8 pb-8 scroll-x whitespace-nowrap" <view class="item border-box rounded-50 flex flex-row items-center" v-for="(item, index) in itemList" :key="index"
> @click="sendReply(item)">
<view
class="item border-box rounded-50 flex flex-row items-center"
v-for="(item, index) in itemList"
:key="index"
@click="sendReply(item)"
>
<view class="flex items-center justify-center"> <view class="flex items-center justify-center">
<image v-if="item.icon" class="icon" :src="item.icon" /> <image v-if="item.icon" class="icon" :src="item.icon" />
<text class="font-size-14 color-2D91FF line-height-20"> <text class="font-size-14 color-2D91FF line-height-20">
@@ -22,6 +16,7 @@
import { ref } from "vue"; import { ref } from "vue";
import { Command } from "@/model/ChatModel"; import { Command } from "@/model/ChatModel";
import { SEND_MESSAGE_COMMAND_TYPE } from "@/constant/constant"; import { SEND_MESSAGE_COMMAND_TYPE } from "@/constant/constant";
import { checkToken } from "@/hooks/useGoLogin";
const itemList = ref([ const itemList = ref([
{ {
@@ -55,7 +50,9 @@ const sendReply = (item) => {
// 快速预定 // 快速预定
if (item.type === Command.quickBooking) { if (item.type === Command.quickBooking) {
checkToken().then(() => {
uni.navigateTo({ url: "/pages-quick/list" }); uni.navigateTo({ url: "/pages-quick/list" });
});
return; return;
} }

View File

@@ -2,19 +2,12 @@
<uni-popup ref="popup" type="bottom" :safe-area="false"> <uni-popup ref="popup" type="bottom" :safe-area="false">
<view class="popup-content border-box pt-12 pl-12 pr-12"> <view class="popup-content border-box pt-12 pl-12 pr-12">
<view class="header flex flex-items-center pb-12"> <view class="header flex flex-items-center pb-12">
<view <view class="title flex-full text-center font-size-17 color-000 font-500 ml-24">更多服务</view>
class="title flex-full text-center font-size-17 color-000 font-500 ml-24"
>更多服务</view
>
<uni-icons type="close" size="24" color="#CACFD8" @click="close" /> <uni-icons type="close" size="24" color="#CACFD8" @click="close" />
</view> </view>
<view class="list bg-white border-box pl-20 pr-20"> <view class="list bg-white border-box pl-20 pr-20">
<view <view class="item border-box border-bottom pt-20 pb-20" v-for="(item, index) in list" :key="index">
class="item border-box border-bottom pt-20 pb-20"
v-for="(item, index) in list"
:key="index"
>
<view class="flex flex-items-center flex-justify-center"> <view class="flex flex-items-center flex-justify-center">
<image v-if="item.icon" class="left" :src="item.icon" /> <image v-if="item.icon" class="left" :src="item.icon" />
<view class="center flex-full"> <view class="center flex-full">
@@ -25,10 +18,7 @@
{{ item.content }} {{ item.content }}
</view> </view>
</view> </view>
<view <view class="right border-box font-size-12 color-white line-height-16" @click="handleClick(item)">
class="right border-box font-size-12 color-white line-height-16"
@click="handleClick(item)"
>
{{ item.btnText }} {{ item.btnText }}
</view> </view>
</view> </view>
@@ -42,6 +32,7 @@
import { ref } from "vue"; import { ref } from "vue";
import { Command } from "@/model/ChatModel"; import { Command } from "@/model/ChatModel";
import { SEND_MESSAGE_COMMAND_TYPE } from "@/constant/constant"; import { SEND_MESSAGE_COMMAND_TYPE } from "@/constant/constant";
import { checkToken } from "@/hooks/useGoLogin";
const popup = ref(null); const popup = ref(null);
@@ -100,7 +91,10 @@ const handleClick = (item) => {
close(); close();
if (item.path) { if (item.path) {
checkToken().then(() => {
uni.navigateTo({ url: item.path }); uni.navigateTo({ url: item.path });
});
return; return;
} }

View File

@@ -17,17 +17,9 @@
<view class="login-agreement flex flex-items-center"> <view class="login-agreement flex flex-items-center">
<CheckBox v-model="isAgree"> <CheckBox v-model="isAgree">
<text class="font-size-12 color-525866">我已阅读并同意</text> <text class="font-size-12 color-525866">我已阅读并同意</text>
<text <text class="font-size-12 color-2D91FF ml-4 mr-4" @click.stop="handleAgreeClick('service')">服务协议</text>
class="font-size-12 color-2D91FF ml-4 mr-4"
@click.stop="handleAgreeClick('service')"
>服务协议</text
>
<text class="font-size-12 color-525866"></text> <text class="font-size-12 color-525866"></text>
<text <text class="font-size-12 color-2D91FF ml-4 mr-4" @click.stop="handleAgreeClick('privacy')">隐私协议</text>
class="font-size-12 color-2D91FF ml-4 mr-4"
@click.stop="handleAgreeClick('privacy')"
>隐私协议</text
>
<text class="font-size-12 color-525866">\n</text> <text class="font-size-12 color-525866">\n</text>
<text class="font-size-12 color-525866 ml-30">授权与账号关联操作</text> <text class="font-size-12 color-525866 ml-30">授权与账号关联操作</text>
</CheckBox> </CheckBox>
@@ -37,23 +29,13 @@
<view class="login-btn-area"> <view class="login-btn-area">
<!-- 同意隐私协议并获取手机号按钮 --> <!-- 同意隐私协议并获取手机号按钮 -->
<button <button class="login-btn" type="primary" :open-type="needWxLogin ? 'getPhoneNumber' : ''"
class="login-btn" @getphonenumber="getPhoneNumber" @click="handleAgreeAndGetPhone">
type="primary"
:open-type="needWxLogin ? 'getPhoneNumber' : ''"
@getphonenumber="getPhoneNumber"
@click="handleAgreeAndGetPhone"
>
手机号快捷登录 手机号快捷登录
</button> </button>
</view> </view>
<AgreePopup <AgreePopup ref="agreePopup" :visible="visible" :agreement="computedAgreement" @close="visible = false" />
ref="agreePopup"
:visible="visible"
:agreement="computedAgreement"
@close="visible = false"
/>
</view> </view>
</template> </template>
@@ -67,7 +49,7 @@ import {
import { onLogin, goBack, refreshToken } from "@/hooks/useGoLogin"; import { onLogin, goBack, refreshToken } from "@/hooks/useGoLogin";
import CheckBox from "@/components/CheckBox/index.vue"; 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.js"; import { zniconsMap } from "@/static/fonts/znicons";
import { getCurrentConfig } from "@/constant/base"; import { getCurrentConfig } from "@/constant/base";
const needWxLogin = ref(false); const needWxLogin = ref(false);
@@ -83,7 +65,7 @@ const logo = computed(() => getCurrentConfig().logo);
const handleAgreeAndGetPhone = () => { const handleAgreeAndGetPhone = () => {
// 如果需要微信登录,直接返回 // 如果需要微信登录,直接返回
if (needWxLogin.value) { if (needWxLogin.value) {
return return;
} }
if (!isAgree.value) { if (!isAgree.value) {
@@ -94,7 +76,7 @@ const handleAgreeAndGetPhone = () => {
return; return;
} }
refreshToken().then(() => goBack()); refreshToken(true).then(() => goBack());
}; };
const getPhoneNumber = (e) => { const getPhoneNumber = (e) => {
@@ -150,6 +132,7 @@ onShow(async () => {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "./styles/index.scss"; @import "./styles/index.scss";
@font-face { @font-face {
font-family: znicons; font-family: znicons;
src: url("@/static/fonts/znicons.ttf"); src: url("@/static/fonts/znicons.ttf");

View File

@@ -1,7 +1,7 @@
import { goLogin } from "@/hooks/useGoLogin"; import { goLogin } from "@/hooks/useGoLogin";
import { useAppStore } from "@/store"; import { useAppStore } from "@/store";
import { getStorageSyncToken } from "@/constant/token"; import { getAccessToken } from "@/constant/token";
import { removeStorageSyncToken } from "@/constant/token"; import { removeAccessToken } from "@/constant/token";
/// 请求流式数据的API /// 请求流式数据的API
const API = "/agent/assistant/chat"; const API = "/agent/assistant/chat";
@@ -74,7 +74,7 @@ const stopAbortTask = () => {
const agentChatStream = (params, onChunk) => { const agentChatStream = (params, onChunk) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const token = getStorageSyncToken(); const token = getAccessToken();
const requestId = Date.now().toString(); // 生成唯一请求ID const requestId = Date.now().toString(); // 生成唯一请求ID
// 重置状态 // 重置状态
@@ -132,7 +132,7 @@ const agentChatStream = (params, onChunk) => {
res.statusCode res.statusCode
); );
if (res.statusCode === 424) { if (res.statusCode === 424) {
removeStorageSyncToken(); removeAccessToken();
goLogin(); goLogin();
} }
if (onChunk) { if (onChunk) {
@@ -146,7 +146,8 @@ const agentChatStream = (params, onChunk) => {
} }
} else { } else {
console.log( console.log(
`❌ 请求 [${requestId}] ${isAborted ? "已终止" : "已过期" `❌ 请求 [${requestId}] ${
isAborted ? "已终止" : "已过期"
}忽略complete回调` }忽略complete回调`
); );
} }

View File

@@ -1,4 +1,4 @@
import { removeStorageSyncToken } from "@/constant/token"; import { removeAccessToken } from "@/constant/token";
import request from "../base/request"; import request from "../base/request";
const wxLogin = (args) => { const wxLogin = (args) => {
@@ -9,7 +9,7 @@ const wxLogin = (args) => {
}, },
}; };
removeStorageSyncToken(); removeAccessToken();
return request.post("/auth/oauth2/token", args, config); return request.post("/auth/oauth2/token", args, config);
}; };
@@ -20,8 +20,8 @@ const bindUserPhone = (args) => {
}; };
// 检测用户是否绑定手机号 // 检测用户是否绑定手机号
const checkUserPhone = (args) => { const checkUserPhone = (config) => {
return request.get("/hotelBiz/user/checkUserHasBindPhone", args); return request.get("/hotelBiz/user/checkUserHasBindPhone", {}, config);
}; };
// 获取登录用户手机号 // 获取登录用户手机号

View File

@@ -1,11 +1,11 @@
import { getCurrentConfig } from "@/constant/base"; import { getCurrentConfig } from "@/constant/base";
import { useAppStore } from "@/store"; import { useAppStore } from "@/store";
import { getStorageSyncToken } from "@/constant/token"; import { getAccessToken } from "@/constant/token";
export const updateImageFile = (file) => { export const updateImageFile = (file) => {
const { serverConfig } = useAppStore(); const { serverConfig } = useAppStore();
const url = serverConfig.baseUrl + "/hotelBiz/hotBizCommon/upload"; const url = serverConfig.baseUrl + "/hotelBiz/hotBizCommon/upload";
const token = getStorageSyncToken(); const token = getAccessToken();
const clientId = getCurrentConfig().clientId; const clientId = getCurrentConfig().clientId;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@@ -2,7 +2,7 @@ import { goLogin } from "../../hooks/useGoLogin";
import { getCurrentConfig } from "@/constant/base"; import { getCurrentConfig } from "@/constant/base";
import { useAppStore } from "@/store"; import { useAppStore } from "@/store";
import { NOTICE_EVENT_LOGOUT } from "@/constant/constant"; import { NOTICE_EVENT_LOGOUT } from "@/constant/constant";
import { getStorageSyncToken } from "@/constant/token"; import { getAccessToken } from "@/constant/token";
const clientId = getCurrentConfig().clientId; const clientId = getCurrentConfig().clientId;
const defaultConfig = { const defaultConfig = {
@@ -20,7 +20,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
url = appStore.serverConfig?.baseUrl + url; url = appStore.serverConfig?.baseUrl + url;
} }
// 动态获取 token // 动态获取 token
const token = getStorageSyncToken(); const token = getAccessToken();
let header = { let header = {
...defaultConfig.header, ...defaultConfig.header,
@@ -31,8 +31,8 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
if (customConfig.noToken) { if (customConfig.noToken) {
delete header.Authorization; delete header.Authorization;
} else { } else {
if (token) { if (token || customConfig.token) {
header.Authorization = `Bearer ${token}`; header.Authorization = `Bearer ${token || customConfig.token}`;
} }
} }
@@ -59,7 +59,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
resolve(res.data); resolve(res.data);
if (res.statusCode && res.statusCode === 424) { if (res.statusCode && res.statusCode === 424) {
console.log("424错误重新登录"); console.log("424错误重新登录");
// removeStorageSyncToken(); // removeAccessToken();
uni.$emit(NOTICE_EVENT_LOGOUT); uni.$emit(NOTICE_EVENT_LOGOUT);
// goLogin(); // goLogin();
} }