Merge remote-tracking branch 'origin/master'

doum

13 小时以前 b902b40fda2f1dccca0825277d07908119deecfd

 mini-program/pages/mall/mall.vue

@@ -12,7 +12,7 @@
               </view>
            </view>
            <view class="head-tabs">
               <u-tabs lineColor="#E4001D" :list="list" @click="clickCate"></u-tabs>
               <u-tabs lineColor="#E4001D" :itemStyle="{ height: '100rpx' }" :list="list" @click="clickCate"></u-tabs>
            </view>
         </view>
         
@@ -519,8 +519,8 @@
            .head-tabs {
               width: 100%;
               height: 100rpx;
               display: flex;
               align-items: flex-end;
               // display: flex;
               // align-items: flex-end;
               border-bottom: 1rpx solid #E5E5E5;
            }
         }