This commit is contained in:
zhuoda
2020-02-12 14:11:47 +08:00
parent 37172a5105
commit 081555c6e8
10 changed files with 19 additions and 40 deletions

View File

@@ -1,6 +1,6 @@
import Axios from 'axios';
import config from '@/config';
import { Message, Spin } from 'iview';
import { Message, Spin } from 'view-design';
import cookie from '@/lib/cookie';
// 之所以封装这个axios是因为在一些请求中无法上传信息很尴尬估计原因是继承的有问题无法携带headers
export const baseUrl = config.baseUrl.apiUrl;

View File

@@ -4,9 +4,9 @@ import { localRead } from '@/lib/local';
import customZhCn from './lang/zh-CN';
import customZhTw from './lang/zh-TW';
import customEnUs from './lang/en-US';
import zhCnLocale from 'iview/src/locale/lang/zh-CN';
import enUsLocale from 'iview/src/locale/lang/en-US';
import zhTwLocale from 'iview/src/locale/lang/zh-TW';
import zhCnLocale from 'view-design/src/locale/lang/zh-CN';
import enUsLocale from 'view-design/src/locale/lang/en-US';
import zhTwLocale from 'view-design/src/locale/lang/zh-TW';
Vue.use(VueI18n);

View File

@@ -4,7 +4,7 @@ import Vue from 'vue';
import App from './App';
import router from './router';
import store from './store';
import iView from 'iview';
import ViewUI from 'view-design';
import i18n from '@/locale';
import config from '@/config';
import importDirective from '@/directives';
@@ -24,7 +24,7 @@ import enumInfo from '@/constants';
import tableAction from './lib/table-action';
Vue.prototype.$tableAction = tableAction;
Vue.use(Enum, { enumInfo });
Vue.use(iView, {
Vue.use(ViewUI, {
i18n: (key, value) => i18n.t(key, value)
});
Vue.use(JsonViewer);

View File

@@ -1,4 +1,4 @@
import { Modal } from 'iview';
import { Modal } from 'view-design';
const beforeClose = {
before_close_normal: resolve => {

View File

@@ -2,7 +2,7 @@ import Vue from 'vue';
import Router from 'vue-router';
import { routers } from './routers';
import store from '@/store';
import iView from 'iview';
import ViewUI from 'view-design';
import cookie from '@/lib/cookie';
import { localRead } from '@/lib/local';
import { setTitle } from '@/lib/menu-func';
@@ -51,7 +51,7 @@ Router.prototype.closeCurrentPageAndPush = function (pushParam) {
};
let storeSelf = store;
router.beforeEach((to, from, next) => {
iView.LoadingBar.start();
ViewUI.LoadingBar.start();
const token = cookie.getToken();
if (!token && to.name !== LOGIN_PAGE_NAME) {
// 未登录且要跳转的页面不是登录页
@@ -68,7 +68,7 @@ router.beforeEach((to, from, next) => {
name: homeName
});
setTitle(to, router.app);
iView.LoadingBar.finish();
ViewUI.LoadingBar.finish();
window.scrollTo(0, 0);
} else {
// 特殊页面直接放行
@@ -98,7 +98,7 @@ router.beforeEach((to, from, next) => {
router.afterEach(to => {
setTitle(to, router.app);
iView.LoadingBar.finish();
ViewUI.LoadingBar.finish();
window.scrollTo(0, 0);
});

View File

@@ -16,7 +16,7 @@ import { file } from './module/file';
/**
*
* iview-admin中meta除了原生参数外可配置的参数:
* meta除了原生参数外可配置的参数:
* meta: {
* title: { String|Number|Function }
* 显示在侧边栏、面包屑和标签栏的文字

View File

@@ -1,4 +1,4 @@
@import '~iview/src/styles/index.less';
@import '~view-design/src/styles/index.less';
/**************
导航栏
**************/
@@ -256,9 +256,7 @@
box-shadow: none;
}
}
.ivu-form-item{
margin-bottom: 15px;
}
.ivu-spin-fix{
background-color: rgba(255, 255, 255, 0.3);
}