diff --git a/src/components/popconfirm_delete/index.vue b/src/components/popconfirm_delete/index.vue index b478ee47a84c2b5da9761425088d361a5cacfe9d..db2347c45fd012c98ff47041c24da28c213b73e1 100644 --- a/src/components/popconfirm_delete/index.vue +++ b/src/components/popconfirm_delete/index.vue @@ -31,7 +31,11 @@ export default { methods: { async confirm() { if (typeof this.url === 'string') { - await delReq(this.url); + try { + await delReq(this.url); + } catch (error) { + return; + } } if (typeof this.url === 'object') { switch (this.url.method) { diff --git a/src/main.js b/src/main.js index 19ea87b74a74a59c075bbdbb92ff5568356ef78e..7f64ea3a5bfaa69dec77816b2344afefc0751d9d 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,6 @@ import Router from 'vue-router'; import { initRouter } from './router'; import VueI18n from 'vue-i18n'; import { accountModule, settingModule } from './pages/frame/store'; -import globalStore from '@/store'; import App from './App.vue'; import Plugins from './plugins'; import { loadRoutes, loadGuards, setAppOptions } from './utils/routerUtil'; @@ -27,7 +26,6 @@ Vue.config.productionTip = false; Vue.use(Vuex); //加载 框架的module包括 命名空间accountModule,settingModule const store = new Vuex.Store({ - ...globalStore, modules: { accountModule, settingModule }, }); diff --git a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue index e5c4d66c06fb53203f8915d261270245700d39b2..ac2d6901452eb3ad65ffff0f845f9fcaeef57e67 100644 --- a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue +++ b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue @@ -19,15 +19,15 @@