添加收藏茶室接口和完善茶室详情

src/store/user.ts

@@ -7,6 +7,7 @@ import {
 	logout as _logout,
 	wxLogin as _wxLogin,
 	getWxCode,
+	mobileLogin as _mobileLogin
 } from '@/api/login'
 import { toast } from '@/utils/toast'
 
@@ -22,9 +23,13 @@ const userInfoState: IUserInfoVo = {
 	account: '',
 	channel: 0,
 	is_new_user: 1,
-	mobile: ''
+	mobile: '',
+	username: '',
 }
 
+// 默认未登录
+const isLoggedIn = ref<boolean>(false)
+
 export const useUserStore = defineStore(
 	'user',
 	() => {
@@ -52,16 +57,16 @@ export const useUserStore = defineStore(
 			userInfo.value = { ...userInfoState }
 			uni.removeStorageSync('userInfo')
 			uni.removeStorageSync('token')
+			isLoggedIn.value = false
 		}
 		/**
 		 * 获取用户信息
 		 */
 		const getUserInfo = async () => {
 			const res = await _getUserInfo()
-			const userInfo = res.data
+			const userInfo = res
 			setUserInfo(userInfo)
 			uni.setStorageSync('userInfo', userInfo)
-			uni.setStorageSync('token', userInfo.token)
 			// TODO 这里可以增加获取用户路由的方法 根据用户的角色动态生成路由
 			return res
 		}
@@ -83,6 +88,19 @@ export const useUserStore = defineStore(
 			return res
 		}
 
+		/**
+		 * 账号密码登录
+		 */
+		const mobileLogin = async (account: string, terminal: number, scene: number) => {
+			const res = await _mobileLogin({ account, terminal, scene})
+			console.log("🚀 ~ mobileLogin ~ res:", res)
+			uni.setStorageSync('token', res.token)
+
+			await getUserInfo()
+			isLoggedIn.value = true
+			return res
+		}
+
 		/**
 		 * 退出登录 并 删除用户信息
 		 */
@@ -99,8 +117,12 @@ export const useUserStore = defineStore(
 			console.log('微信登录code', data)
 
 			const res = await _wxLogin(data)
-			await getUserInfo()
-			return res
+			uni.setStorageSync('token', res.token)
+
+			const user = await getUserInfo()
+
+			isLoggedIn.value = true
+			return res && user
 		}
 
 		return {
@@ -111,7 +133,9 @@ export const useUserStore = defineStore(
 			setUserAvatar,
 			logout,
 			setUserInfo,
-			removeUserInfo
+			removeUserInfo,
+			isLoggedIn,
+			mobileLogin
 		}
 	},
 	{