解决冲突

src/components/News/index.vue

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

src/views/layout/Layout.vue

@@ -26,7 +26,9 @@ export default {
   mixins: [ResizeMixin],
   watch: {
     '$route.path'() {
-      this.showBtn()
+      setTimeout(() => {
+        this.showBtn()
+      },500)
     }
   },
   computed: {
@@ -78,8 +80,12 @@ export default {
       }
       for(var i = 0; i < perList.length; i++) {
         if(perList[i][1] === code) {
+          console.log('perList[i]: ', perList[i]);
           list[perList[i][2]] = true;
         }
+        // if(perList[i][2] === 'reset') {
+        //   console.log('perList[i]: ', perList[i]);
+        // }
       }
       this.setShowBtnList(list)
     },

vue.config.js

@@ -4,10 +4,13 @@ var path = require("path");
 const BASE_API = "https://test.tall.wiki/datang/v1.0"
 const proxyUrl = '/datang/v1.0'
 
+// const BASE_API =  "https://test.tall.wiki/datang/v1.0"
+// const proxyUrl = 'datang/v1.0'
+
 const port = 8080
 
 module.exports = {
-    publicPath: '/manage',
+    publicPath: '/v1.0/manage',
     devServer: {
         open: true,
         overlay: {