Merge branch 'master' into release-20170915

components/product/component/StoreInfo.vue

@@ -270,7 +270,7 @@
   .storeInfo .storeIn-active {
     width: 98px;
     height: 49px;
-    line-height: 49px;
+    line-height: 46px;
     float: left;
     border: 1px solid #5078cb;
     text-align: center;
@@ -282,6 +282,7 @@
     display: table-cell;
     height: 46px;
     width: 98px;
+    line-height: 46px;
     text-align: center;
     vertical-align: middle;
   }