Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix

Conflicts:
	static/sass/product/_detail.scss

@@ -30,20 +30,28 @@ $basicBtnC:#eb0313;
             margin-top: pxToRem(20px);
             margin-bottom: pxToRem(20px);
             font-size: pxToRem(24px);
-            line-height: pxToRem(36px);  
+            line-height: pxToRem(36px);
             &.table {
+                @include flexbox((
+                    display: flex,
+                    flex-wrap: wrap,
+                    justify-content: flex-start
+                ));
                 width: 100%;
                 .column {
                     box-sizing: border-box;
-                    padding: pxToRem(20px) pxToRem(12px);
+                    //padding: pxToRem(20px) pxToRem(12px);
+                    padding: 4% 3%;
                     //width: 50%;
                     border-bottom: pxToRem(4px) solid #fff;
                     border-right: pxToRem(4px) solid #fff;
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
-                    display: flex;
-                    align-items: center;
-                    flex-basis: 49.9%;
+                    @include flexbox((
+                        display: flex,
+                        align-items: center,
+                        flex-basis: 49.9%
+                    ))
                 }
             }
         }