Commit 1ba4f6e34b65416f255123976b38c284404a106e
1 parent
e4af99a2
1
Showing
1 changed file
with
2 additions
and
3 deletions
src/main.js
| @@ -5,19 +5,18 @@ import router from './router' | @@ -5,19 +5,18 @@ import router from './router' | ||
| 5 | import 'normalize.css/normalize.css' | 5 | import 'normalize.css/normalize.css' |
| 6 | import ElementUI from 'element-ui'; | 6 | import ElementUI from 'element-ui'; |
| 7 | import './styles/element-variables.scss' | 7 | import './styles/element-variables.scss' |
| 8 | -import './assets/scss/common.scss' | 8 | +import '@/assets/scss/common.scss' |
| 9 | import '@/assets/style/common.scss' | 9 | import '@/assets/style/common.scss' |
| 10 | import * as filters from './filters' // global filters | 10 | import * as filters from './filters' // global filters |
| 11 | 11 | ||
| 12 | import '@/styles/index.scss' // global css | 12 | import '@/styles/index.scss' // global css |
| 13 | -import './assets/scss/theme.scss' // 主题 | 13 | +import '@/assets/scss/theme.scss' // 主题 |
| 14 | import { message } from './utils/message'; | 14 | import { message } from './utils/message'; |
| 15 | 15 | ||
| 16 | import 'element-ui/lib/theme-chalk/index.css'; | 16 | import 'element-ui/lib/theme-chalk/index.css'; |
| 17 | import store from './store' | 17 | import store from './store' |
| 18 | import './permission' | 18 | import './permission' |
| 19 | import moment from "moment"; | 19 | import moment from "moment"; |
| 20 | -import './assets/scss/common.scss' | ||
| 21 | import i18n from './lang' // internationalization | 20 | import i18n from './lang' // internationalization |
| 22 | 21 | ||
| 23 | 22 |