diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index ac7fef176..b5d3fbdeb 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -14,9 +14,8 @@ const cache = { module.exports = { entry: { - vendor: ['packages'], 'vant-docs': './docs/src/index.js', - 'vant-examples': './docs/src/examples.js' + 'vant-mobile': './docs/src/mobile.js' }, output: { path: path.join(__dirname, '../docs/dist'), @@ -28,7 +27,7 @@ module.exports = { host: '0.0.0.0', historyApiFallback: { rewrites: [ - { from: /^\/zanui\/vant\/examples/, to: '/examples.html' }, + { from: /^\/zanui\/vant\/mobile/, to: '/mobile.html' }, { from: /^\/zanui\/vant/, to: '/index.html' } ] }, @@ -99,9 +98,9 @@ module.exports = { inject: true }), new HtmlWebpackPlugin({ - chunks: ['vendor', 'vant-examples'], + chunks: ['vendor', 'vant-mobile'], template: 'docs/src/index.tpl', - filename: 'examples.html', + filename: 'mobile.html', inject: true }), new webpack.optimize.CommonsChunkPlugin({ diff --git a/docs/src/DocsApp.vue b/docs/src/DocsApp.vue index 9c658666d..f1125b6e2 100644 --- a/docs/src/DocsApp.vue +++ b/docs/src/DocsApp.vue @@ -12,14 +12,14 @@ import docConfig from './doc.config'; export default { data() { return { - simulators: [`/zanui/vant/examples${location.hash}`], + simulators: [`/zanui/vant/mobile${location.hash}`], demoURL: '' }; }, computed: { base() { - return `/${this.$vantLang}/component`; + return `/${this.$vantLang}`; }, config() { diff --git a/docs/src/components/DemoList.vue b/docs/src/components/DemoList.vue index 901593479..346f76ede 100644 --- a/docs/src/components/DemoList.vue +++ b/docs/src/components/DemoList.vue @@ -11,7 +11,7 @@

{{ description }}

- +
@@ -34,10 +34,6 @@ export default { }, computed: { - base() { - return `${this.$vantLang}/component`; - }, - navList() { return this.docConfig[this.$vantLang].nav || []; }, @@ -64,8 +60,6 @@ export default { width: 100%; box-sizing: border-box; padding: 60px 15px 20px; - position: relative; - z-index: 1; .zanui-title, .zanui-desc { diff --git a/docs/src/index.js b/docs/src/index.js index 7c4cf0456..0a94823a0 100644 --- a/docs/src/index.js +++ b/docs/src/index.js @@ -3,22 +3,20 @@ import VueRouter from 'vue-router'; import App from './DocsApp'; import routes from './router'; import VantDoc from 'vant-doc'; -import isMobile from './utils/is-mobile'; +import { isMobile } from './utils'; import './components/nprogress.css'; Vue.use(VueRouter).use(VantDoc); -const routesConfig = routes(); - const router = new VueRouter({ mode: 'hash', base: '/zanui/vant/', - routes: routesConfig + routes: routes() }); router.beforeEach((route, redirect, next) => { if (isMobile) { - location.replace('/zanui/vant/examples' + location.hash); + location.replace('/zanui/vant/mobile' + location.hash); } document.title = route.meta.title || document.title; next(); @@ -34,5 +32,5 @@ window.vueRouter = router; new Vue({ // eslint-disable-line render: h => h(App), router, - el: '#app-container' + el: '#app' }); diff --git a/docs/src/index.tpl b/docs/src/index.tpl index 69b454a59..cda514314 100644 --- a/docs/src/index.tpl +++ b/docs/src/index.tpl @@ -12,9 +12,7 @@ -
- -
+
diff --git a/docs/src/examples.js b/docs/src/mobile.js similarity index 87% rename from docs/src/examples.js rename to docs/src/mobile.js index 0606bdf2f..85604ca14 100644 --- a/docs/src/examples.js +++ b/docs/src/mobile.js @@ -17,11 +17,10 @@ Vue lazyComponent: true }); -const routesConfig = routes(true); const router = new VueRouter({ mode: 'hash', - base: '/zanui/vant/examples', - routes: routesConfig + base: '/zanui/vant/mobile', + routes: routes(true) }); router.afterEach(() => { @@ -38,5 +37,5 @@ window.vueRouter = router; new Vue({ // eslint-disable-line render: h => h(App), router, - el: '#app-container' + el: '#app' }); diff --git a/docs/src/router.js b/docs/src/router.js index 6b96d1d58..08c8fff13 100644 --- a/docs/src/router.js +++ b/docs/src/router.js @@ -22,7 +22,7 @@ const registerRoute = (isExample) => { } else { route.push({ path: `/${lang}`, - redirect: `/${lang}/component/intro` + redirect: `/${lang}/intro` }); } @@ -56,7 +56,7 @@ const registerRoute = (isExample) => { route.push({ name, component, - path: `/${lang}/component${path}`, + path: `/${lang}${path}`, meta: { lang, name: page.title diff --git a/docs/src/utils/iframe-router.js b/docs/src/utils/iframe-router.js index c705bdc2b..d7085b3f4 100644 --- a/docs/src/utils/iframe-router.js +++ b/docs/src/utils/iframe-router.js @@ -2,9 +2,8 @@ * 同步父窗口和 iframe 的 vue-router 状态 */ -import isMobile from './is-mobile'; import { setLang } from './lang'; -import { iframeReady } from './iframe'; +import { iframeReady, isMobile } from './'; window.syncPath = function(dir) { const router = window.vueRouter; diff --git a/docs/src/utils/iframe.js b/docs/src/utils/index.js similarity index 65% rename from docs/src/utils/iframe.js rename to docs/src/utils/index.js index e9b5db8f8..583d53634 100644 --- a/docs/src/utils/iframe.js +++ b/docs/src/utils/index.js @@ -1,4 +1,4 @@ -export function iframeReady(iframe, callback) { +function iframeReady(iframe, callback) { const doc = iframe.contentDocument || iframe.contentWindow.document; const interval = () => { if (iframe.contentWindow.changePath) { @@ -16,3 +16,11 @@ export function iframeReady(iframe, callback) { iframe.onload = interval; } } + +const ua = navigator.userAgent.toLowerCase(); +const isMobile = /ios|iphone|ipod|ipad|android/.test(ua); + +export { + isMobile, + iframeReady +}; diff --git a/docs/src/utils/is-mobile.js b/docs/src/utils/is-mobile.js deleted file mode 100644 index 1338e318d..000000000 --- a/docs/src/utils/is-mobile.js +++ /dev/null @@ -1,7 +0,0 @@ -const isMobile = (function() { - var platform = navigator.userAgent.toLowerCase(); - return (/(android|bb\d+|meego).+mobile|kdtunion|weibo|m2oapp|micromessenger|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i).test(platform) || - (/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i).test(platform.substr(0, 4)); -})(); - -export default isMobile; diff --git a/test/components/badge.vue b/test/components/badge.vue index 05c3a6ade..db90a1778 100644 --- a/test/components/badge.vue +++ b/test/components/badge.vue @@ -1,22 +1,6 @@ - - diff --git a/test/components/checkbox.vue b/test/components/checkbox.vue index 1b8cfd1c4..4da1ce266 100644 --- a/test/components/checkbox.vue +++ b/test/components/checkbox.vue @@ -1,19 +1,11 @@ - diff --git a/test/components/goods-action.vue b/test/components/goods-action.vue index bf867989c..a2973e5f0 100644 --- a/test/components/goods-action.vue +++ b/test/components/goods-action.vue @@ -1,37 +1,16 @@ - - diff --git a/test/components/more-tabs.vue b/test/components/more-tabs.vue index 6313f92ca..52373eed7 100644 --- a/test/components/more-tabs.vue +++ b/test/components/more-tabs.vue @@ -12,15 +12,7 @@ - diff --git a/test/components/number-keyboard.vue b/test/components/number-keyboard.vue index b6cd28b8d..4deeec5df 100644 --- a/test/components/number-keyboard.vue +++ b/test/components/number-keyboard.vue @@ -5,15 +5,9 @@ diff --git a/test/components/radio.vue b/test/components/radio.vue index 9b22e700d..d248fd799 100644 --- a/test/components/radio.vue +++ b/test/components/radio.vue @@ -4,17 +4,9 @@ 单选框2 - + diff --git a/test/components/steps.vue b/test/components/steps.vue index 917ae2235..348c72f92 100644 --- a/test/components/steps.vue +++ b/test/components/steps.vue @@ -8,15 +8,7 @@ - + +