Merge branch 'master' into dev

packages/uni-h5/package.json

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

src/platforms/h5/components/app/tabBar.vue

@@ -14,6 +14,7 @@
         <div class="uni-tabbar__bd">
           <div
             v-if="item.iconPath"
+            :class="{'uni-tabbar__icon__diff':!item.text}"
             class="uni-tabbar__icon">
             <img :src="_getRealPath($route.meta.pagePath===item.pagePath?item.selectedIconPath:item.iconPath)">
           </div>
@@ -92,6 +93,12 @@ uni-tabbar .uni-tabbar__icon {
   height: 27px;
 }
 
+uni-tabbar .uni-tabbar__icon.uni-tabbar__icon__diff{
+  margin-top: 0px;
+  width: 34px;
+  height: 34px;
+}
+
 uni-tabbar .uni-tabbar__icon img {
   width: 100%;
   height: 100%;
@@ -207,7 +214,7 @@ export default {
       if (url === __uniRoutes[0].alias) {
         url = '/'
       }
-      if (this.$route.path !== url) {
+      if (this.$route.path !== url) {
         this.__path__ = this.$route.path
         uni.switchTab({
           url