From 80afc30e6c43b1ef8bc310c2abbdfa680c9c3c7a Mon Sep 17 00:00:00 2001 From: LiYang Date: Mon, 1 Aug 2016 11:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=9F=E6=9C=89alert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/admin/src/App.vue | 6 +----- frontend/admin/src/locales.js | 4 ---- frontend/admin/src/main.js | 13 +++++++------ 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/frontend/admin/src/App.vue b/frontend/admin/src/App.vue index 67fbb92..5ec2738 100644 --- a/frontend/admin/src/App.vue +++ b/frontend/admin/src/App.vue @@ -11,7 +11,6 @@
- @@ -32,15 +31,12 @@ import unsupportedBrowserWarning from "./components/utils/unsupportedBrowserWarning.vue" import topNav from "./components/utils/topNav.vue" import leftNav from "./components/utils/leftNav.vue" - import alert from "./components/utils/alert.vue" - export default({ components: { unsupportedBrowserWarning, topNav, - leftNav, - alert + leftNav } }) \ No newline at end of file diff --git a/frontend/admin/src/locales.js b/frontend/admin/src/locales.js index e68db77..acbdeac 100644 --- a/frontend/admin/src/locales.js +++ b/frontend/admin/src/locales.js @@ -11,10 +11,6 @@ export default { first: "首页", last: "末页" }, - modalAlert: { - alert: "提示", - close: "关闭" - }, request: { error: "请求失败", succeeded: "操作成功" diff --git a/frontend/admin/src/main.js b/frontend/admin/src/main.js index 15d5d8a..1e9354e 100644 --- a/frontend/admin/src/main.js +++ b/frontend/admin/src/main.js @@ -12,9 +12,9 @@ import "expose?$!expose?jQuery!jquery" import "bootstrap" import bootbox from "bootbox" +// i18n settings Vue.use(VueI18n); - // todo: strore lang config in localstorage var lang = "zh-cn"; Vue.config.lang = lang; @@ -23,7 +23,10 @@ Object.keys(locale).forEach(function (lang) { Vue.locale(lang, locale[lang]) }); -var request = { +///////// + +// custom ajax +Vue.use({ install: function (Vue, options) { function getCookie(name) { var value = "; " + document.cookie; @@ -78,13 +81,11 @@ var request = { } } } -}; +}); +/////// -Vue.use(request); Vue.use(VueRouter); - - var router = new VueRouter(); router.map({