drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/iview/iview into carousel

Browse source 
Conflicts:
	src/styles/components/index.less
	test/app.vue
	test/main.js
This commit is contained in:
Rijn 2017-01-17 17:31:51 -06:00
commit 50f4ac7088
27 changed files with 463 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/main.js
View file

@ -6,9 +6,10 @@ import VueRouter from 'vue-router';
import App from './app.vue';
import iView from '../src/index';
// import locale from '../src/locale/lang/en-US';
import locale from '../src/locale/lang/zh-CN';
Vue.use(VueRouter);
Vue.use(iView);
Vue.use(iView, { locale });
// 开启debug模式
Vue.config.debug = true;
@ -139,6 +140,11 @@ router.map({
require(['./routers/carousel.vue'], resolve);
}
},
'/rate': {
component: function (resolve) {
require(['./routers/rate.vue'], resolve);
}
},
});
router.beforeEach(function () {