Commit cba46f7c authored by 周远喜's avatar 周远喜

ok

parent 0a5dac08
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
** Global CSS ** Global CSS
*/ */
css: [ css: [
'./libs/iview-pro/iview-pro.css', // './libs/iview-pro/iview-pro.css',
// { // {
// src: '@/styles/index.less', // src: '@/styles/index.less',
// lang: 'less' // lang: 'less'
...@@ -79,13 +79,13 @@ export default { ...@@ -79,13 +79,13 @@ export default {
/* /*
** You can extend webpack config here ** You can extend webpack config here
*/ */
loaders:{ // loaders:{
less:{ // less:{
javascriptEnabled:true // javascriptEnabled:true
} // }
}, // },
extend (config, ctx) { extend (config, ctx) {
config.resolve.alias['_c']=path.resolve(__dirname, 'components') // config.resolve.alias['_c']=path.resolve(__dirname, 'components')
// config.module.rules.push({ // config.module.rules.push({
// enforce:'pre', // enforce:'pre',
// test: /\.vue$/, // test: /\.vue$/,
...@@ -105,9 +105,9 @@ export default { ...@@ -105,9 +105,9 @@ export default {
// .add(path.resolve(__dirname,'libs/iview-pro')) // .add(path.resolve(__dirname,'libs/iview-pro'))
// .end(); // .end();
// }, // },
,plugins: [ // ,plugins: [
new webpack.ProvidePlugin({'window.Quill':'quill' }) // new webpack.ProvidePlugin({'window.Quill':'quill' })
] // ]
} }
} }
...@@ -6,10 +6,10 @@ import VueDND from 'awe-dnd' ...@@ -6,10 +6,10 @@ import VueDND from 'awe-dnd'
// import iViewPro from '@/libs/iViewPro/iview-pro.min.js'; // import iViewPro from '@/libs/iViewPro/iview-pro.min.js';
// import '@/libs/iViewPro/iview-pro.css'; // import '@/libs/iViewPro/iview-pro.css';
import iViewPro from '../iview-pro/src/index.js'; import iViewPro from '../iview-pro/src/index.js';
// import '@/libs/iview-pro/iview-pro.css'; import '@/libs/iview-pro/iview-pro.css';
import '@/styles/index.less'; import '@/styles/index.less';
import '@/libs/iview-pro/iview-pro.css'; // import '@/libs/iview-pro/iview-pro.css';
// 内置组件 // 内置组件
import iLink from '@/components/link'; import iLink from '@/components/link';
Vue.component("iLink", iLink) Vue.component("iLink", iLink)
...@@ -18,7 +18,7 @@ export default ({ ...@@ -18,7 +18,7 @@ export default ({
store store
}) => { }) => {
Vue.use(VueI18n) Vue.use(VueI18n)
Vue.use(VueDND) // Vue.use(VueDND)
app.i18n = new VueI18n({ app.i18n = new VueI18n({
locale: 'zh-CN', locale: 'zh-CN',
messages: Languages messages: Languages
......
@import "./default/index.less"; @import "./default/index.less";
@import "./font/iconfont.css"; // @import "./font/iconfont.css";
@import "./setting.less"; @import "./setting.less";
@import "./common.less"; @import "./common.less";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment