From fbafa3db60c8c9f2d99188f59285ea7c19503903 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Tue, 30 Jun 2020 17:50:32 +0800
Subject: [PATCH] first commit

---
 components/layouts/pc/header.vue |  1 -
 nuxt.config.js                   | 21 +++++++++---------
 pages/article/_article_id.vue    | 37 ++++++++++++++++++--------------
 pages/login.vue                  |  1 +
 plugins/vditor.js                |  4 ++++
 store/article.js                 | 28 ++++++++++++------------
 6 files changed, 50 insertions(+), 42 deletions(-)
 create mode 100644 plugins/vditor.js

diff --git a/components/layouts/pc/header.vue b/components/layouts/pc/header.vue
index 41fc334..235167a 100644
--- a/components/layouts/pc/header.vue
+++ b/components/layouts/pc/header.vue
@@ -144,7 +144,6 @@
         let _ts = this;
         let activeMenu = _ts.$store.state.activeMenu;
         if (activeMenu !== item) {
-          this.$store.commit('setActiveMenu', item);
           if (item === 'topic') {
             _ts.$router.push(
               {
diff --git a/nuxt.config.js b/nuxt.config.js
index 76facdc..b3213e5 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,6 +1,6 @@
 import appConfig from './config/app.config'
 import apiConfig from './config/api.config'
-import { isProdMode, isDevMode } from './environment'
+import {isProdMode, isDevMode} from './environment'
 
 
 export default {
@@ -32,13 +32,13 @@ export default {
   head: {
     title: appConfig.meta.title,
     meta: [
-      { charset: 'utf-8' },
-      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'keywords', name: 'keywords', content: appConfig.meta.keywords },
-      { hid: 'description', name: 'description', content: appConfig.meta.description }
+      {charset: 'utf-8'},
+      {name: 'viewport', content: 'width=device-width, initial-scale=1'},
+      {hid: 'keywords', name: 'keywords', content: appConfig.meta.keywords},
+      {hid: 'description', name: 'description', content: appConfig.meta.description}
     ],
     link: [
-      { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
+      {rel: 'icon', type: 'image/x-icon', href: '/favicon.ico'}
     ]
   },
   /*
@@ -52,19 +52,18 @@ export default {
   ** https://nuxtjs.org/guide/plugins
   */
   plugins: [
-    '@/plugins/element-ui',
-    // '@/plugins/axios'
+    {src: '@/plugins/element-ui', ssr: true},
+    {src: '@/plugins/vditor', ssr: false}
   ],
   /*
   ** Nuxt.js dev-modules
   */
-  buildModules: [
-  ],
+  buildModules: [],
   /*
   ** Nuxt.js modules
   */
   modules: [
-    ['@nuxtjs/axios', { baseURL: apiConfig.BASE }]
+    ['@nuxtjs/axios', {baseURL: apiConfig.BASE}]
   ],
   /*
   ** Build configuration
diff --git a/pages/article/_article_id.vue b/pages/article/_article_id.vue
index 2ae8fa2..9fafa11 100644
--- a/pages/article/_article_id.vue
+++ b/pages/article/_article_id.vue
@@ -120,7 +120,7 @@
 <script>
   import Vue from 'vue';
   import { mapState } from 'vuex';
-  import VditorPreview from 'vditor/dist/method.min';
+
   export default {
     name: "ArticleDetail",
     validate({params, store}) {
@@ -141,6 +141,11 @@
         isMobile: state => state.global.isMobile,
       })
     },
+    head () {
+      return {
+        title: this.article.articleTitle
+      }
+    },
     data() {
       return {
         isShow: true,
@@ -188,21 +193,21 @@
     },
     mounted() {
       Vue.nextTick(() => {
-        const previewElement = document.getElementById("articleContent");
-        // //const outLineElement = document.getElementById("articleToC");
-        // VditorPreview.setContentTheme('light');
-        VditorPreview.codeRender(previewElement, 'zh_CN');
-        VditorPreview.highlightRender({"enable":true,"lineNumber":false,"style":"github"}, previewElement);
-        VditorPreview.mathRender(previewElement, {
-          math: {"engine":"KaTeX","inlineDigit":false,"macros":{}},
-        });
-        VditorPreview.mermaidRender(previewElement, ".language-mermaid");
-        VditorPreview.graphvizRender(previewElement);
-        VditorPreview.chartRender(previewElement);
-        VditorPreview.mindmapRender(previewElement);
-        VditorPreview.abcRender(previewElement);
-        VditorPreview.mediaRender(previewElement);
-        //VditorPreview.outlineRender(previewElement, outLineElement);
+          const previewElement = document.getElementById("articleContent");
+          // //const outLineElement = document.getElementById("articleToC");
+          // VditorPreview.setContentTheme('light');
+        Vue.VditorPreview.codeRender(previewElement, 'zh_CN');
+        Vue.VditorPreview.highlightRender({"enable":true,"lineNumber":false,"style":"github"}, previewElement);
+        Vue.VditorPreview.mathRender(previewElement, {
+            math: {"engine":"KaTeX","inlineDigit":false,"macros":{}},
+          });
+        Vue.VditorPreview.mermaidRender(previewElement, ".language-mermaid");
+        Vue.VditorPreview.graphvizRender(previewElement);
+        Vue.VditorPreview.chartRender(previewElement);
+        Vue.VditorPreview.mindmapRender(previewElement);
+        Vue.VditorPreview.abcRender(previewElement);
+        Vue.VditorPreview.mediaRender(previewElement);
+          //VditorPreview.outlineRender(previewElement, outLineElement);
       })
     }
 
diff --git a/pages/login.vue b/pages/login.vue
index 7f0c883..c127435 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -78,6 +78,7 @@
             }
 
             _ts.$axios.$post('/api/v1/console/login', data).then(function (res) {
+              console.log(res);
               if (res.data) {
                 if (res.data.message) {
                   _ts.$message(res.data.message);
diff --git a/plugins/vditor.js b/plugins/vditor.js
new file mode 100644
index 0000000..aa4b6fd
--- /dev/null
+++ b/plugins/vditor.js
@@ -0,0 +1,4 @@
+import Vue from 'vue';
+import VditorPreview from 'vditor/dist/method.min';
+
+Vue.VditorPreview = VditorPreview
diff --git a/store/article.js b/store/article.js
index 5bf6970..95250d0 100644
--- a/store/article.js
+++ b/store/article.js
@@ -81,24 +81,24 @@ export const actions = {
     // const delay = fetchDelay(
     //   isBrowser
     // )
-    console.log(params)
-    if (isBrowser) {
-      Vue.nextTick(() => {
-        window.scrollTo(0, 300);
-      })
-    }
+    // if (isBrowser) {
+    //   Vue.nextTick(() => {
+    //     window.scrollTo(0, 300);
+    //   })
+    // }
     commit('updateDetailFetching', true)
-    commit('updateDetailData', {})
+    // commit('updateDetailData', {})
     return this.$axios
       .$get(`${ARTICLE_API_PATH}/article/${params.article_id}`)
       .then(response => {
-        commit('updateDetailData', response.data)
-        commit('updateDetailFetching', false)
-        // return new Promise(resolve => {
-        //   delay(() => {
-        //     resolve(response)
-        //   })
-        // })
+        return new Promise(resolve => {
+          commit('updateDetailData', response.data)
+          commit('updateDetailFetching', false)
+          resolve(response)
+          // delay(() => {
+          //   resolve(response)
+          // })
+        })
       })
       .catch(error => {
         commit('updateDetailFetching', false)