diff --git a/src/api/user.js b/src/api/user.js index 0b94609..81c0ee7 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,5 +1,5 @@ import request from '@/js/utils/request' -import { userStore } from '@/stores' +import { useUserStore } from '@/stores' import { CLIENT_TYPE, CLIENT_NAME, CLIENT_VERSION } from '@/const/userConst' import { encryptPasswordObj, encryptDoublePasswordObj } from '@/js/utils/crypto' @@ -7,7 +7,7 @@ export const userRegisterService = async ({ account, nickName, password }) => { const obj = await encryptPasswordObj(account, password) return request.post('/user/register', { account: account, - clientId: userStore().clientId, + clientId: useUserStore().clientId, nickName: nickName, ...obj }) @@ -17,7 +17,7 @@ export const userNonceService = ({ account }) => { return request.get('/user/nonce', { params: { account: account, - clientId: userStore().clientId + clientId: useUserStore().clientId } }) } @@ -34,7 +34,7 @@ export const userForgetService = async (obj) => { const passwordObjObj = await encryptPasswordObj(obj.account, obj.password) delete obj.password return request.post('/user/forget', { - clientId: userStore().clientId, + clientId: useUserStore().clientId, ...obj, ...passwordObjObj }) @@ -44,7 +44,7 @@ export const userLoginService = async ({ account, password }) => { const obj = await encryptPasswordObj(account, password) return request.post('/user/login', { account: account, - clientId: userStore().clientId, + clientId: useUserStore().clientId, ...obj }) } @@ -64,7 +64,7 @@ export const userModifySelfService = (obj) => { export const userModifyPassword = async ({ account, oldPasswordStr, newPasswordStr }) => { const obj = await encryptDoublePasswordObj(account, oldPasswordStr, newPasswordStr) return request.post('/user/modifyPwd', { - clientId: userStore().clientId, + clientId: useUserStore().clientId, ...obj }) } diff --git a/src/components/card/GroupCard.vue b/src/components/card/GroupCard.vue index 1240604..16d8ebe 100644 --- a/src/components/card/GroupCard.vue +++ b/src/components/card/GroupCard.vue @@ -11,7 +11,13 @@ import DeleteButton from '@/components/common/DeleteButton.vue' import EditAvatar from '@/components/common/EditAvatar.vue' import { combineId } from '@/js/utils/common' import { userQueryService } from '@/api/user' -import { groupStore, userStore, messageStore, userCardStore, groupCardStore } from '@/stores' +import { + useGroupStore, + useUserStore, + useMessageStore, + useUserCardStore, + useGroupCardStore +} from '@/stores' import SelectUserDialog from '../common/SelectUserDialog.vue' import SingleSelectDialog from '../common/SingleSelectDialog.vue' import { @@ -28,11 +34,11 @@ import router from '@/router' import GroupMembersTable from '../common/GroupMembersTable.vue' import { msgChatCreateSessionService } from '@/api/message' -const groupData = groupStore() -const userData = userStore() -const messageData = messageStore() -const userCardData = userCardStore() -const groupCardData = groupCardStore() +const groupData = useGroupStore() +const userData = useUserStore() +const messageData = useMessageStore() +const userCardData = useUserCardStore() +const groupCardData = useGroupCardStore() const isShowSelectDialog = ref(false) const isShowSingleSelectDialog = ref(false) const isShowEditAvatar = ref(false) diff --git a/src/components/card/UserCard.vue b/src/components/card/UserCard.vue index 85bcd63..0806a36 100644 --- a/src/components/card/UserCard.vue +++ b/src/components/card/UserCard.vue @@ -11,16 +11,16 @@ import { VideoCamera } from '@element-plus/icons-vue' import default_avatar from '@/assets/image/default_avatar.png' -import { userStore, messageStore, userCardStore } from '@/stores' +import { useUserStore, useMessageStore, useUserCardStore } from '@/stores' import { combineId } from '@/js/utils/common' import { MsgType } from '@/proto/msg' import { msgChatCreateSessionService } from '@/api/message' import router from '@/router' import { ElMessage } from 'element-plus' -const userData = userStore() -const messageData = messageStore() -const userCardData = userCardStore() +const userData = useUserStore() +const messageData = useMessageStore() +const userCardData = useUserCardStore() const sessionId = computed(() => { return combineId(userData.user.account, userCardData.userInfo?.account) diff --git a/src/components/common/EditAvatar.vue b/src/components/common/EditAvatar.vue index 2c2110b..dda1ee2 100644 --- a/src/components/common/EditAvatar.vue +++ b/src/components/common/EditAvatar.vue @@ -1,6 +1,6 @@