Merge branch 'master' into dev

packages/uni-h5/package.json

 {
 	"name": "@dcloudio/uni-h5",
-	"version": "0.5.4",
+	"version": "0.5.5",
 	"description": "uni-app h5",
 	"main": "dist/index.umd.min.js",
 	"scripts": {

src/platforms/h5/components/app/popup/picker.vue

@@ -281,7 +281,7 @@ export default {
       return val[0] * 60 + val[1]
     },
     _getDateValue (val) {
-      return val[0] * 366 + (val[1] || 0 * 31) + (val[2] || 0)
+      return val[0] * 366 + (val[1] || 0) * 31 + (val[2] || 0)
     },
     /**
      * 将右侧数组值同步到左侧（交集部分）