Merge remote-tracking branch 'origin/master'

k94314517

2024-08-15 89e7ed902461f28d6a7dd3e6c927eaf40b154f5e

 wechat_jiaxuan/components/disProduct/index.less

@@ -165,7 +165,7 @@
      }
    }
    .goods_list {
      height: 100%;
      height: calc( 100% - 100rpx );
      width: 590rpx;
      box-sizing: border-box;
      padding: 12rpx 40rpx;