refine

Author: PanJiaChen

src/api/article.js

@@ -1,13 +1,13 @@
 import fetch from 'utils/fetch'
 
-export function getList () {
+export function getList() {
   return fetch({
     url: '/article/list',
     method: 'get'
   })
 }
 
-export function getArticle () {
+export function getArticle() {
   return fetch({
     url: '/article/detail',
     method: 'get'

src/api/article_table.js

@@ -1,14 +1,14 @@
 import fetch from 'utils/fetch'
 
-export function fetchList (query) {
+export function fetchList(query) {
   return fetch({
     url: '/article_table/list',
     method: 'get',
     params: query
   })
 }
 
-export function fetchPv (pv) {
+export function fetchPv(pv) {
   return fetch({
     url: '/article_table/pv',
     method: 'get',

src/api/login.js

@@ -1,6 +1,6 @@
 import fetch from 'utils/fetch'
 
-export function loginByUsername (username, password) {
+export function loginByUsername(username, password) {
   const data = {
     username,
     password
@@ -12,14 +12,14 @@ export function loginByUsername (username, password) {
   })
 }
 
-export function logout () {
+export function logout() {
   return fetch({
     url: '/login/logout',
     method: 'post'
   })
 }
 
-export function getInfo (token) {
+export function getInfo(token) {
   return fetch({
     url: '/user/info',
     method: 'get',

src/api/qiniu.js

@@ -1,6 +1,6 @@
 import fetch from 'utils/fetch'
 
-export function getToken () {
+export function getToken() {
   return fetch({
     url: '/qiniu/upload/token', // 假地址 自行替换
     method: 'get'

src/api/remoteSearch.js

@@ -1,6 +1,6 @@
 import fetch from 'utils/fetch'
 
-export function userSearch (name) {
+export function userSearch(name) {
   return fetch({
     url: '/search/user',
     method: 'get',

src/components/MdEditor/index.vue renamed to src/components/MarkdownEditor/index.vue

@@ -52,11 +52,9 @@ export default {
       height: this.height,
       body_class: 'panel-body ',
       object_resizing: false,
-          //  language: 'zh_CN',
-          //  language_url: '/static/tinymce/langs/zh_CN.js',
       toolbar: this.toolbar,
       menubar: this.menubar,
-      plugins: 'advlist,autolink,code,paste,textcolor, colorpicker,fullscreen,link,lists,media,wordcount, imagetools,watermark',
+      plugins: 'advlist,autolink,code,paste,textcolor, colorpicker,fullscreen,link,lists,media,wordcount, imagetools',
       end_container_on_empty_block: true,
       powerpaste_word_import: 'clean',
       code_dialog_height: 450,
@@ -160,14 +158,4 @@ export default {
   visibility: hidden;
   z-index: -1;
 }
-
-.editor-custom-btn-container {
-  position: absolute;
-  right: 15px;
-  top: 18px;
-}
-
-.editor-upload-btn {
-  display: inline-block;
-}
 </style>

src/components/Tinymce/index.vue

@@ -3,21 +3,20 @@
     <div class="twoDndList-list" :style="{width:width1}">
       <h3>{{list1Title}}</h3>
       <draggable :list="list1" class="dragArea" :options="{group:'article'}">
-        <div class="list-complete-item" v-for="element in list1" :key='element'>
+        <div class="list-complete-item" v-for="element in list1" :key='element.id'>
           <div class="list-complete-item-handle">[{{element.author}}] {{element.title}}</div>
           <div style="position:absolute;right:0px;">
             <span style="float: right ;margin-top: -20px;margin-right:5px;" @click="deleteEle(element)">
-                        <i style="color:#ff4949" class="el-icon-delete"></i>
-                    </span>
+              <i style="color:#ff4949" class="el-icon-delete"></i>
+            </span>
           </div>
         </div>
       </draggable>
     </div>
-
     <div class="twoDndList-list" :style="{width:width2}">
       <h3>{{list2Title}}</h3>
       <draggable :list="filterList2" class="dragArea" :options="{group:'article'}">
-        <div class="list-complete-item" v-for="element in filterList2" :key='element'>
+        <div class="list-complete-item" v-for="element in filterList2" :key='element.id'>
           <div class='list-complete-item-handle2' @click="pushEle(element)"> [{{element.author}}] {{element.title}}</div>
         </div>
       </draggable>
@@ -27,6 +26,7 @@
 
 <script>
 import draggable from 'vuedraggable'
+
 export default {
   name: 'twoDndList',
   components: { draggable },

src/components/twoDndList/index.vue

@@ -65,8 +65,8 @@ export const asyncRouterMap = [
       { path: 'index', component: _import('components/index'), name: '介绍 ' },
       { path: 'tinymce', component: _import('components/tinymce'), name: '富文本编辑器' },
       { path: 'markdown', component: _import('components/markdown'), name: 'Markdown' },
-      { path: 'jsoneditor', component: _import('components/jsoneditor'), name: 'JSON编辑器' },
-      { path: 'dndlist', component: _import('components/dndlist'), name: '列表拖拽' },
+      { path: 'jsoneditor', component: _import('components/jsonEditor'), name: 'JSON编辑器' },
+      { path: 'dndlist', component: _import('components/dndList'), name: '列表拖拽' },
       { path: 'splitpane', component: _import('components/splitpane'), name: 'SplitPane' },
       { path: 'avatarupload', component: _import('components/avatarUpload'), name: '头像上传' },
       { path: 'dropzone', component: _import('components/dropzone'), name: 'Dropzone' },

src/router/index.js

@@ -115,10 +115,16 @@ const user = {
     // 动态修改权限
     ChangeRole({ commit }, role) {
       return new Promise(resolve => {
-        commit('SET_ROLES', [role])
         commit('SET_TOKEN', role)
         setToken(role)
-        resolve()
+        getInfo(role).then(response => {
+          const data = response.data
+          commit('SET_ROLES', data.role)
+          commit('SET_NAME', data.name)
+          commit('SET_AVATAR', data.avatar)
+          commit('SET_INTRODUCTION', data.introduction)
+          resolve()
+        })
       })
     }
   }