diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index a70c778a0..2a1b95031 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -1,9 +1,8 @@ const webpack = require('webpack'); const path = require('path'); +const HtmlWebpackPlugin = require('html-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const ProgressBarPlugin = require('progress-bar-webpack-plugin'); -const HtmlWebpackPlugin = require('html-webpack-plugin'); -const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'); const isProduction = process.env.NODE_ENV === 'production'; const docConfig = require('../docs/src/doc.config'); @@ -127,7 +126,6 @@ module.exports = { minChunks: 2, filename: isProduction ? 'vendor.[hash:8].js' : 'vendor.js' }), - new OptimizeCssAssetsPlugin(), new ExtractTextPlugin({ filename: isProduction ? '[name].[hash:8].css' : '[name].css', allChunks: true diff --git a/docs/examples-docs/coupon.md b/docs/examples-docs/coupon.md index 0f30ee984..fba3aede9 100644 --- a/docs/examples-docs/coupon.md +++ b/docs/examples-docs/coupon.md @@ -1,5 +1,3 @@ -## Coupon 优惠券选择器 - + + +## Coupon 优惠券选择器 + ### 使用指南 ``` javascript import { CouponCell, CouponList } from 'vant'; @@ -81,14 +90,15 @@ Vue.component(CouponList.name, CouponList); > - + + + ``` ```javascript @@ -116,6 +126,7 @@ export default { methods: { onChange(index) { + this.showList = false; this.chosenCoupon = index; }, onExchange(code) { diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md index 1d5f0b70f..61c9af637 100644 --- a/docs/examples-docs/steps.md +++ b/docs/examples-docs/steps.md @@ -12,6 +12,13 @@ .van-steps__message + p { margin-bottom: 10px; } + + p, + h3 { + margin: 0; + font-size: inherit; + font-weight: normal; + } } diff --git a/docs/src/components/demo-list.vue b/docs/src/components/demo-list.vue index 301b4d072..0877b7c49 100644 --- a/docs/src/components/demo-list.vue +++ b/docs/src/components/demo-list.vue @@ -29,33 +29,33 @@ export default { diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js index 0e42554c6..7ab9edcd7 100644 --- a/docs/src/doc.config.js +++ b/docs/src/doc.config.js @@ -8,11 +8,11 @@ module.exports = { '微信小程序': 'https://github.com/youzan/zanui-weapp' }, footer: { - copyright: `2012-${(new Date()).getFullYear()} © youzanyun.com - 浙公网安备 33010602004354号 增值电信业务经营许可证:浙B2-20140331 - 浙ICP备13037466号`, + github: 'https://github.com/youzan/vant', nav: { '有赞官网': 'https://www.youzan.com/', - '有赞云': 'http://www.youzanyun.com/zanui', - '加入我们': 'https://job.youzan.com/' + '加入我们': 'https://job.youzan.com/', + '意见反馈': 'https://github.com/youzan/vant/issues' } }, nav: [ diff --git a/package.json b/package.json index 65ac938cd..f76835748 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,6 @@ "markdown-it": "^8.4.0", "markdown-it-container": "^2.0.0", "mocha": "^3.4.2", - "optimize-css-assets-webpack-plugin": "^3.1.1", "postcss": "^6.0.10", "postcss-easy-import": "^2.1.0", "postcss-loader": "^2.0.6", diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue index 0ce765aaa..dff11f5da 100644 --- a/packages/actionsheet/index.vue +++ b/packages/actionsheet/index.vue @@ -2,7 +2,7 @@
-

+
    diff --git a/packages/card/index.vue b/packages/card/index.vue index 69f93dbb1..b672be415 100644 --- a/packages/card/index.vue +++ b/packages/card/index.vue @@ -8,14 +8,14 @@
    -

    {{ title }}

    -

    ¥ {{ price }}

    +
    {{ title }}
    +
    ¥ {{ price }}
    -

    {{ desc }}

    -

    x {{ num }}

    +
    {{ desc }}
    +
    x {{ num }}
    diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue index 2787e4de9..9a7ddaae9 100644 --- a/packages/coupon-list/index.vue +++ b/packages/coupon-list/index.vue @@ -1,5 +1,5 @@