From dec28158d245d7a6bc3593cac0534d9986a14193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Sat, 7 Jan 2023 17:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86wiki=E5=8D=87=E7=BA=A7=E4=B8=BAvue3?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/{common => assets}/api/common.js | 0 .../src/{common => assets}/api/page.js | 0 .../src/{common => assets}/api/request.js | 21 +- .../src/{common => assets}/api/system.js | 0 .../src/{common => assets}/api/user.js | 0 .../src/{common => assets}/lib/HtmlUtil.js | 0 .../src/{common => assets}/lib/UnitUtil.js | 0 .../src/{common => assets}/lib/wangEditor.css | 0 zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png | Bin 6849 -> 0 bytes .../src/components/layouts/GlobalLayout.vue | 9 +- .../src/components/layouts/ShareLayout.vue | 2 +- .../components/layouts/ShareMobileLayout.vue | 2 +- .../src/components/space/CreateSpace.vue | 2 +- .../wiki-ui-2/src/store/pageData.js | 4 +- .../src/views/common/AboutDialog.vue | 2 +- .../wiki-ui-2/src/views/home/Home.vue | 11 +- .../wiki-ui-2/src/views/page/Edit.vue | 2 +- .../wiki-ui-2/src/views/page/Search.vue | 2 +- .../wiki-ui-2/src/views/page/Show.vue | 237 +++--------------- .../src/views/page/components/Navigation.vue | 9 +- .../src/views/page/share/mobile/View.vue | 4 +- .../src/views/page/share/pc/Home.vue | 2 +- .../src/views/page/share/pc/View.vue | 8 +- .../wiki-ui-2/src/views/page/show/Comment.vue | 202 +++++++++++++++ .../src/views/page/show/PageHistory.vue | 49 ++++ .../wiki-ui-2/src/views/space/Manage.vue | 10 +- .../wiki-ui-2/src/views/user/MyInfo.vue | 2 +- 27 files changed, 338 insertions(+), 242 deletions(-) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/api/common.js (100%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/api/page.js (100%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/api/request.js (77%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/api/system.js (100%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/api/user.js (100%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/lib/HtmlUtil.js (100%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/lib/UnitUtil.js (100%) rename zyplayer-doc-ui/wiki-ui-2/src/{common => assets}/lib/wangEditor.css (100%) delete mode 100644 zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png create mode 100644 zyplayer-doc-ui/wiki-ui-2/src/views/page/show/Comment.vue create mode 100644 zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/common.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/common.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/common.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/common.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/page.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/page.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/page.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/page.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/request.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/request.js similarity index 77% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/request.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/request.js index 2e57f8f9..8ba0ed63 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/common/api/request.js +++ b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/request.js @@ -12,30 +12,32 @@ const noValidate = { '/zyplayer-doc-db/executor/execute': true, } -service.interceptors.request.use( - (config) => { +service.interceptors.request.use((config) => { config.needValidateResult = true // 增加不需要验证结果的标记 if (noValidate[config.url]) { config.needValidateResult = false } return config - }, - (error) => { + }, (error) => { console.log(error) return Promise.reject(error) } ) - +let lastToastLoginTime = new Date().getTime(); service.interceptors.response.use( (response) => { if (!!response.message) { ElMessage.error('请求错误：' + response.message) } else { - if (!response.config.needValidateResult || response.data.errCode == 200) { + if (!response.config.needValidateResult || response.data.errCode === 200) { return response.data - } else if (response.data.errCode == 400) { - ElMessage.error('请先登录') + } else if (response.data.errCode === 400) { + // 两秒钟只提示一次 + if (new Date().getTime() - lastToastLoginTime > 2000) { + ElMessage.warning('请先登录'); + lastToastLoginTime = new Date().getTime(); + } let href = encodeURIComponent(window.location.href) window.location = import.meta.env.VITE_APP_BASE_API + '#/user/login?redirect=' + href } else if (response.data.errCode !== 200) { @@ -43,8 +45,7 @@ service.interceptors.response.use( } } return Promise.reject('请求错误') - }, - (error) => { + }, (error) => { console.log('err' + error) ElMessage.info('请求错误：' + error.message) return Promise.reject(error) diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/system.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/system.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/system.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/system.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/user.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/user.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/user.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/user.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/lib/HtmlUtil.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/lib/HtmlUtil.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/lib/HtmlUtil.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/lib/HtmlUtil.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/lib/UnitUtil.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/lib/UnitUtil.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/lib/UnitUtil.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/lib/UnitUtil.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/lib/wangEditor.css b/zyplayer-doc-ui/wiki-ui-2/src/assets/lib/wangEditor.css similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/lib/wangEditor.css rename to zyplayer-doc-ui/wiki-ui-2/src/assets/lib/wangEditor.css diff --git a/zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png b/zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 { location.reload() }) } +let storeUser = useStoreUserData(); const getSelfUserInfo = () => { userApi.getSelfUserInfo().then((json) => { - userSelfInfo.value = json.data + userSelfInfo.value = json.data; + storeUser.userInfo = json.data; }) } const getSpaceInfo = (spaceId) => { diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue index c401269c..fa494b29 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue @@ -49,7 +49,7 @@ import { Document as ElIconDocument, Search as ElIconSearch, } from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' import RightResize from './RightResize.vue' let leftCollapse = ref(true); diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue index cde94b41..b87676fe 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue @@ -17,7 +17,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue'; import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' import PageTree from './PageTree' import 'vant/es/icon/style/index'; import 'vant/es/popup/style/index'; diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue index 01acceb5..8191e7e0 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue @@ -42,7 +42,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue'; import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' let editSpaceId = ref(''); let newSpaceFormRules = ref({ diff --git a/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js b/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js index bf31021b..56f73239 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js +++ b/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js @@ -3,8 +3,8 @@ import {defineStore} from 'pinia' export const useStorePageData = defineStore('pageData', { state: () => { return { - pageLoadStatus: 0, + pageInfo: {}, } }, -}) +}); diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue index b8663a9d..6381daa9 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue @@ -69,7 +69,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue'; import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' -import systemApi from '../../common/api/system' +import systemApi from '../../assets/api/system' onMounted(() => { checkSystemUpgrade() diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue index 08abd11c..924e0f3f 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue @@ -32,14 +32,19 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmi import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' import {View as ElIconView} from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' - +import pageApi from '../../assets/api/page' let totalCount = ref(0); let searchParam = ref({spaceId: '', newsType: 1, pageNum: 1, pageSize: 20,}); let spacePageNews = ref([]); // 列表类型 -let newsTypesArr = ref([{key: 1, val: '最近更新'}, {key: 2, val: '最新创建'}, {key: 3, val: '查看最多'}, {key: 4, val: '点赞最多'}, {key: 5, val: '查看+点赞最多'},]); +let newsTypesArr = ref([ + {key: 1, val: '最近更新'}, + {key: 2, val: '最新创建'}, + {key: 3, val: '查看最多'}, + {key: 4, val: '点赞最多'}, + {key: 5, val: '查看+点赞最多'}, +]); let newsTypesMap = ref({}); onBeforeRouteUpdate((to) => { diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue index 1f8f4848..e261b230 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue @@ -60,7 +60,7 @@ import { Check as ElIconCheck, Back as ElIconBack, } from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' import {mavonEditor} from 'mavon-editor' import 'mavon-editor/dist/markdown/github-markdown.min.css' import 'mavon-editor/dist/css/index.css' diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue index 4e039def..1da9a3d0 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue @@ -47,7 +47,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmi import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' import {View as ElIconView, Search as ElIconSearch} from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' let route = useRoute(); let router = useRouter(); diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue index d8f2bba0..78517264 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue @@ -3,37 +3,29 @@ - +
{{ wikiPage.name }}
-
- {{ wikiPage.updateUserName }}　于　{{wikiPage.updateTime}}　修改 - {{ wikiPage.createUserName }}　于　{{wikiPage.createTime}}　创建 -
+ + + {{ wikiPage.updateUserName }}　于　{{wikiPage.updateTime}}　修改 + {{ wikiPage.createUserName }}　于　{{wikiPage.createTime}}　创建 + + 评论 - + 上传附件 - 编辑 - + 编辑 + 更多 @@ -49,25 +41,27 @@ -
-
+ +
- + - + - - + + + + @@ -97,7 +91,7 @@
- + @@ -108,43 +102,9 @@ -
-
- 暂无评论 -
- - - -
- {{ comment.createUserName.substr(0, 1) }} -
-
- {{ comment.createUserName }} - -

确定要除删此评论吗？

-
- 取消 - 确定 -
- - -
- 
{{ comment.content }}
- - - -
-
- - 发送 -
+ -
暂无修改历史记录 @@ -248,14 +208,16 @@ import {toRefs, ref, reactive, onMounted, watch, defineProps, defineEmits, defin import {onBeforeRouteUpdate, useRoute, useRouter} from "vue-router"; import { ElMessageBox, ElMessage, ElNotification } from 'element-plus'; import QRCode from 'qrcode' -import unitUtil from '../../common/lib/UnitUtil.js' -import htmlUtil from '../../common/lib/HtmlUtil.js' -import pageApi from '../../common/api/page' -import userApi from '../../common/api/user' +import unitUtil from '../../assets/lib/UnitUtil.js' +import htmlUtil from '../../assets/lib/HtmlUtil.js' +import pageApi from '../../assets/api/page' +import userApi from '../../assets/api/user' import Navigation from './components/Navigation.vue' +import Comment from './show/Comment.vue' import {mavonEditor} from 'mavon-editor' import 'mavon-editor/dist/markdown/github-markdown.min.css' import 'mavon-editor/dist/css/index.css' +import {useStorePageData} from "@/store/pageData"; let page = { colorArr: ['#67C23A', '#409EFF', '#E6A23C', '#F56C6C', '#909399', '#303133'], @@ -276,10 +238,6 @@ let parentPath = ref({}); // 手机扫码 let qrCodeUrl = ref(''); let mobileScanDialogVisible = ref(false); -// 评论相关 -let commentTextInput = ref(''); -let commentList = ref([]); -let recommentInfo = ref({}); let uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + '/zyplayer-doc-wiki/page/file/upload'); // 页面权限 let pageAuthDialogVisible = ref(false); @@ -308,6 +266,8 @@ let downloadFormParam = ref({url: 'zyplayer-doc-wiki/page/download', param: {},} let route = useRoute(); let router = useRouter(); +let storePage = useStorePageData(); + const props = defineProps({ spaceInfo: Object, }); @@ -489,7 +449,6 @@ const closeActionTab = () => { const showCommentWiki = () => { actionTabVisible.value = true actionTabActiveName.value = 'comment' - scrollActionTabComment() computeNavigationWidth() } const showPageHistory = () => { @@ -611,9 +570,9 @@ const loadPageDetail = (pageId) => { setTimeout(() => { previewPageImage() createNavigationHeading() - }, 500) + }, 500); + storePage.pageInfo = wikiPageRes; }) - loadCommentList(pageId) getPageHistory(pageId, 1) } let wikiTitleRef = ref(); @@ -659,33 +618,6 @@ const initImageViewerMask = () => { } }) } -const loadCommentList = (pageId) => { - cancelCommentUser() - pageApi.pageCommentList({pageId: pageId}).then((json) => { - let commentList = json.data || [] - for (let i = 0; i < commentList.length; i++) { - commentList[i].color = getUserHeadBgColor( - commentList[i].createUserId - ) - let subCommentList = commentList[i].commentList || [] - for (let j = 0; j < subCommentList.length; j++) { - let subItem = subCommentList[j] - subItem.color = getUserHeadBgColor.value(subItem.createUserId) - } - commentList[i].commentList = subCommentList - commentList[i].visible = false - } - commentList.value = commentList - scrollActionTabComment() - }) -} -let actionTabCommentRef = ref(); -const scrollActionTabComment = () => { - setTimeout(() => { - let actionTabComment = actionTabCommentRef.value - actionTabComment.scrollTop = actionTabComment.scrollHeight - }, 0) -} const zanPage = (yn) => { let param = {yn: yn, pageId: wikiPage.value.id} pageApi.updatePageZan(param).then(() => { @@ -701,45 +633,6 @@ const showZanPageUser = () => { zanUserList.value = json.data }) } -const recommentUser = (id, index) => { - recommentInfo.value = { - id: id, - index: index, - placeholder: '回复' + (index + 1) + '楼', - } -} -const canDeleteComment = (row) => { - return ( - selfUserId.value == row.createUserId || - wikiPage.value.createUserId == selfUserId.value - ) -} -const deleteComment = (id) => { - pageApi.deletePageComment({id: id}).then(() => { - // ElMessage.success("删除成功！"); - loadCommentList(parentPath.value.pageId) - }) -} -const cancelCommentUser = () => { - recommentInfo.value = {} -} -const submitPageComment = () => { - if (commentTextInput.value.length <= 0) { - ElMessage.error('请输入评论内容') - return - } - let param = { - pageId: wikiPage.value.id, - content: commentTextInput.value, - parentId: recommentInfo.value.id, - } - pageApi.updatePageComment(param).then((json) => { - let data = json.data - data.color = getUserHeadBgColor(data.createUserId) - commentTextInput.value = '' - loadCommentList(parentPath.value.pageId) - }) -} const uploadFileError = (err) => { ElMessage.error('上传失败，' + err) } @@ -787,7 +680,7 @@ const initQueryParam = (to) => { diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue new file mode 100644 index 00000000..26982db5 --- /dev/null +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue index 7d12b035..8b52c0ac 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue @@ -96,8 +96,8 @@ import { Refresh as ElIconRefresh, Plus as ElIconPlus, } from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' -import userApi from '../../common/api/user' +import pageApi from '../../assets/api/page' +import userApi from '../../assets/api/user' import CreateSpace from '../../components/space/CreateSpace' let spaceListLoading = ref(false); @@ -105,16 +105,12 @@ let spaceOptions = ref([]); let spaceList = ref([]); let choiceSpace = ref(''); let nowSpaceShow = ref({}); -let newSpaceDialogVisible = ref(false); -let manageSpaceDialogVisible = ref(false); let newSpaceForm = ref({id: '', name: '', spaceExplain: '', treeLazyLoad: 0, openDoc: 0, uuid: '', type: 1,}); -let newSpaceFormRules = ref({name: [{required: true, message: '请输入空间名', trigger: 'blur'}, {min: 2, max: 25, message: '长度在 2 到 25 个字符', trigger: 'blur',},],}); let userSelfInfo = ref({}); // 空间授权 let editSpaceId = ref(''); let spaceAuthDialogVisible = ref(false); let spaceAuthNewGroupId = ref(''); -let spaceAuthGroupLoading = ref(false); let searchGroupList = ref([]); let searchGroupMap = ref({}); let spaceAuthGroupList = ref([]); @@ -125,7 +121,7 @@ let route = useRoute(); let router = useRouter(); let emit = defineEmits('loadSpace'); -onMounted(()=>{ +onMounted(() => { loadSpaceList() getSelfUserInfo() getSpaceSettingList() diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue index 7531fec5..d6455047 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue @@ -22,7 +22,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue'; import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' -import userApi from '../../common/api/user' +import userApi from '../../assets/api/user' let userInfo = ref({}); onMounted(() => {