+ {{ data }}
{{ user.nickname }}
、
diff --git a/src/components/user/UserCardModal.vue b/src/components/user/UserCardModal.vue
index ba57d52..4cf1f2d 100644
--- a/src/components/user/UserCardModal.vue
+++ b/src/components/user/UserCardModal.vue
@@ -19,6 +19,10 @@ const props = defineProps({
uid: {
type: Number,
default: 0
+ },
+ euid: {
+ type: Number,
+ default: 0
}
})
@@ -55,7 +59,7 @@ const options = ref
([])
const onLoadData = () => {
ServeSearchUser({
- erp_user_id: props.uid
+ erp_user_id: props.euid
}).then(({ code, data }) => {
if (code == 200) {
userInfo.value = data
diff --git a/src/hooks/useInject.ts b/src/hooks/useInject.ts
index 10267e3..91ac16d 100644
--- a/src/hooks/useInject.ts
+++ b/src/hooks/useInject.ts
@@ -3,8 +3,8 @@ import { inject } from 'vue'
export function useInject() {
const user: any = inject('$user')
- const showUserInfoModal = (uid: number) => {
- user(uid)
+ const showUserInfoModal = (erp_userid:number,userid?: number,) => {
+ user(erp_userid,userid)
}
return { showUserInfoModal }
diff --git a/src/hooks/useProvideUserModal.ts b/src/hooks/useProvideUserModal.ts
index 3459280..747dc12 100644
--- a/src/hooks/useProvideUserModal.ts
+++ b/src/hooks/useProvideUserModal.ts
@@ -3,8 +3,9 @@ import { ref, provide } from 'vue'
export function useProvideUserModal() {
const isShow = ref(false)
const uid = ref(0)
-
- const show = (id: number) => {
+ const euid=ref(0)
+ const show = (eid: number,id:number) => {
+ euid.value=eid
uid.value = id
isShow.value = true
}
@@ -16,5 +17,5 @@ export function useProvideUserModal() {
provide('$user', show)
- return { isShow, uid, show, close }
+ return { isShow, uid, show, close ,euid}
}
diff --git a/src/hooks/useSessionMenu.ts b/src/hooks/useSessionMenu.ts
index 3d2d1a5..4e5d8b6 100644
--- a/src/hooks/useSessionMenu.ts
+++ b/src/hooks/useSessionMenu.ts
@@ -119,6 +119,8 @@ export function useSessionMenu() {
}
const onUserInfo = (item: ISession) => {
+ console.error('item',item)
+ debugger
user(item.receiver_id)
}
diff --git a/src/main.ts b/src/main.ts
index f5a5dd5..211686e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,10 @@ import router from './router'
import App from './App.vue'
import * as plugins from './plugins'
import request from "@/api/index.js";
-
+if (window.__POWERED_BY_WUJIE__) {
+ // eslint-disable-next-line
+ window.__webpack_public_path__ = window.__WUJIE_PUBLIC_PATH__;
+}
async function bootstrap() {
const app = createApp(App)
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 1f95033..652e13d 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -18,7 +18,7 @@ export function isLoggedIn() {
*/
export function getAccessToken() {
// return storage.get(AccessToken) || ''
- return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22939bb2aea0008a0e4b687680750f2fcff1dd71da701d0a961f65313915a1712826f5c8d3d1fdf999ba3f94912e4744eea50d51ecd72470f47b87cc42ffad74ec3b3c7ff13a011bfbe3a816adfc923db8'
+ return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22b9b32c043123b3db4f35a7a79e1bbe97875bfa18428a4f5ed561887bfbfcab3bd61f2f9348af8bdb89da8c35a7a681fe828af1502b58ebc4ffb99f28fe91d5ba4b0245d1eb24a5ccda9be0cd9bef4d01'
}
/**
diff --git a/src/views/message/inner/panel/PanelContent.vue b/src/views/message/inner/panel/PanelContent.vue
index 6bdc077..fc37085 100644
--- a/src/views/message/inner/panel/PanelContent.vue
+++ b/src/views/message/inner/panel/PanelContent.vue
@@ -320,7 +320,7 @@ onMounted(() => {
diff --git a/vite.config.ts b/vite.config.ts
index 5072a7e..dd4857f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -46,9 +46,9 @@ export default defineConfig(({ mode }) => {
vueJsx({}),
compressPlugin(),
UnoCSS(),
- // vueDevTools({
- // launchEditor: 'cursor',
- // })
+ vueDevTools({
+ launchEditor: 'cursor',
+ })
],
define: {
__APP_ENV__: env.APP_ENV