Merge branch 'bd-test' of 47.94.45.65:angelo/web-base-h5 into bd-online

components/goods-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="content">
+  <view class="goods-list-content">
     <view class="index_btm">
       <view class="index_r_2">
         <!-- <u-scroll-list :indicator="false" class="tabList">
@@ -453,12 +453,11 @@ export default {
   padding: 10px 0;
 }
 
-.content {
+.goods-list-content {
   // background: #f9f9f9;
-  height: 100%;
+  height: auto;
   display: flex;
   flex-direction: column;
-  overflow: hidden;
 }
 
 .index_btm {
@@ -600,8 +599,6 @@ export default {
 
 .goodList {
   padding: 0 20rpx;
-  height: calc(100vh - 320rpx);
-  overflow-y: auto;
 
   .goodList_i {
     // display: flex;