Merge branch 'mall-ui' into dev

src/views/shop-mall/index.module.less

@@ -74,7 +74,7 @@
       margin-right: 10px;
     }
     .van-tabs__wrap{
-      height: initial;
+      height: initial !important;
       padding-top: 14px;
       padding-bottom: 14px;
     }