diff --git a/src/api/blog.ts b/src/api/blog.ts index 1c7e411..a404d13 100644 --- a/src/api/blog.ts +++ b/src/api/blog.ts @@ -11,4 +11,11 @@ const get_blogs = (params: Object) => { }) } -export { get_blogs } \ No newline at end of file +const get_blog = (params: any) => { + return request({ + url: '/blog/' + params.blog_id, + method: 'get' + }) +} + +export { get_blogs, get_blog } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 1ec2ec0..1f78b34 100644 --- a/src/main.ts +++ b/src/main.ts @@ -14,5 +14,31 @@ let app = createApp(App) app.use(router) app.use(ElementPlus) app.use(store) + + +const whiteList = ['/', '/blog'] +let url = window.location.href +console.log(url) +if (url != 'http://localhost:3000/' && url.search("blog=") != -1) { + let blog = { + blog_id: 1 + } + router.push({ + path: '/feedback', + query: blog + }) +} +router.beforeEach((to, from, next) => { + console.log(to.path, from.path) + + + if (whiteList.includes(to.path)) { + next() + } else { + next() + } +}) + + app.mount('#app') diff --git a/src/router/index.ts b/src/router/index.ts index 4fbaecb..1699036 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -69,6 +69,10 @@ const routes: Array = [ } }, ] + }, + { + path: "/feedback", + component: () => import('../view/blog/mdview.vue') } ] diff --git a/src/view/blog/index.vue b/src/view/blog/index.vue index f92f011..6dab9be 100644 --- a/src/view/blog/index.vue +++ b/src/view/blog/index.vue @@ -11,6 +11,8 @@ import MdEditor from 'md-editor-v3'; import 'md-editor-v3/lib/style.css'; import { reactive, ref } from 'vue'; import { get_blogs } from '../../api/blog' +import router from '../../router/index' + type Blog = { blog_id: number, @@ -36,7 +38,10 @@ text.value = "开始吧肿瘤" const openBlog = () => { - window.open("11111") + const { href } = router.resolve({ + path: '/blog=1' + }); + window.open(href, '_blank'); } diff --git a/src/view/blog/mdview.vue b/src/view/blog/mdview.vue new file mode 100644 index 0000000..ce7150a --- /dev/null +++ b/src/view/blog/mdview.vue @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/view/school/PageTab.vue b/src/view/school/PageTab.vue index 0f3bc8e..41d3c8e 100644 --- a/src/view/school/PageTab.vue +++ b/src/view/school/PageTab.vue @@ -92,6 +92,7 @@ const onLeave = () => { align-items: center; width: 90px; height: 35px; + padding-left: 15px; } .page_title { font-size: 14px; diff --git a/src/view/school/SectionTab.vue b/src/view/school/SectionTab.vue index bc1e8a5..fbcec2a 100644 --- a/src/view/school/SectionTab.vue +++ b/src/view/school/SectionTab.vue @@ -81,6 +81,7 @@ const onLeave = () => { align-items: center; width: 90px; height: 35px; + padding-left: 15px; } .page_title { font-size: 14px; diff --git a/src/view/school/index.vue b/src/view/school/index.vue index f715f8f..8754ef1 100644 --- a/src/view/school/index.vue +++ b/src/view/school/index.vue @@ -36,6 +36,7 @@ + +
@@ -143,7 +144,7 @@ const addPage = () => { .nav_tabs { display: flex; flex-direction: column; - width: 70px; + width: 55px; padding: 0px; }