Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

This commit is contained in:
niunai 2017-02-27 19:02:10 +08:00
commit 1ce906d7bb
6 changed files with 15 additions and 11 deletions

View File

@ -25,7 +25,7 @@ module.exports = {
'no-new': 0 'no-new': 0
}, },
"globals": { "globals": {
"oxygen": true, "zanui": true,
"location": true, "location": true,
"Swiper": true, "Swiper": true,
"wysihtml5": true, "wysihtml5": true,

View File

@ -44,15 +44,13 @@ ComponentNames.forEach(name => {
})); }));
if ([ if ([
// directives // directives
'InfiniteScroll',
'Lazyload', 'Lazyload',
'Waterfall',
// services // services
'Dialog', 'Dialog',
'Toast', 'Toast'
'Indicator',
'Waterfall'
].indexOf(componentName) === -1) { ].indexOf(componentName) === -1) {
installTemplate.push(render(ISNTALL_COMPONENT_TEMPLATE, { installTemplate.push(render(ISNTALL_COMPONENT_TEMPLATE, {
name: componentName, name: componentName,

View File

@ -17,6 +17,7 @@
<div class="page-switch__text">OFF, DISABLED</div> <div class="page-switch__text">OFF, DISABLED</div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>

View File

@ -6,11 +6,11 @@ import routes from './router.config';
import demoBlock from './components/demo-block'; import demoBlock from './components/demo-block';
import SideNav from './components/side-nav'; import SideNav from './components/side-nav';
import Mobile from './components/mobile'; import Mobile from './components/mobile';
import Oxygen from '../src/index'; import ZanUI from '../src/index';
import 'packages/zanui-css/src/index.css'; import 'packages/zanui-css/src/index.css';
Vue.use(Oxygen); Vue.use(ZanUI);
Vue.use(VueRouter); Vue.use(VueRouter);
Vue.component('demo-block', demoBlock); Vue.component('demo-block', demoBlock);
Vue.component('side-nav', SideNav); Vue.component('side-nav', SideNav);

View File

@ -1,5 +1,5 @@
{ {
"name": "@youzan/oxygen", "name": "@youzan/zanui-vue",
"version": "0.0.1", "version": "0.0.1",
"description": "有赞vue wap组件库", "description": "有赞vue wap组件库",
"main": "lib/zanui.js", "main": "lib/zanui.js",
@ -23,7 +23,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@gitlab.qima-inc.com:fe/oxygen.git" "url": "git@gitlab.qima-inc.com:fe/zanui-vue.git"
}, },
"keywords": [ "keywords": [
"youzan", "youzan",

View File

@ -0,0 +1,5 @@
@component-namespace z {
@b steps {
color: red;
}
}