Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-admin

src/App.vue

@@ -21,24 +21,20 @@ export default {
 
    methods: {
      setCode(path) {
-       console.log('path: ', path);
        router.options.routes.forEach(first => {
            if(first && first.path && first.path === path){
-             console.log('first.code: ',first, first.code);
              localStorage.setItem('code', first.code)
              return;
            }else{
              if(first.children && first.children.length){
                first.children.forEach(second => {
                   if(second && second.path && second.path === path){
-                    console.log('second.code: ', second.code);
                     localStorage.setItem('code', second.code)
                     return;
                   }else{
                     if(second.children && second.children.length){
                       second.children.forEach(third => {
                         if(third && third.path && third.path === path){
-                          console.log('third.code: ', third.code);
                           localStorage.setItem('code', third.code)
                           return;
                         }

src/components/Detail/editor.vue

@@ -4,8 +4,8 @@
 
 <script>
   import {BASE_API} from '../../config';
-  import E from 'wangEditor'
-  // import E from './wangEditor.min.js'
+  // import E from 'wangEditor'
+  import E from './wangEditor.min.js'
   export default {
     name: 'editoritem',
     props:{

src/components/News/index.vue

@@ -160,7 +160,6 @@
              * 获取详情列表
              */
             getList(options) {
-                console.log('options: ', options);
                 const { pageNum, pageSize, showPage } = this;
                 const params = {
                     pageNum,
@@ -171,7 +170,7 @@
                     params.showType = 0
                 }
                 if(showPage === '0204'){
-                    params.showPage = options.showPage
+                    params.showPage = options && options.showPage ? options.showPage : '0203'
                     params.showType = 1
                 }
                 if(options){