Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 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;