Merge branch '修改/商城样式' into 楚楚/楚楚master

packageA/market/detail.scss

@@ -181,7 +181,6 @@ swiper {
     color: #666666;
 
     .row {
-      height: 40rpx;
       line-height: 40rpx;
       margin-bottom: 20rpx;
     }

pages/index/market/index.js

@@ -62,6 +62,7 @@ Component({
           sa_brandid: sa_brandid,
           where: {
             istool: 0,
+            ishide: 0
           }
         }
       }).then(res => {