Merge remote-tracking branch 'origin/master'

jiangping

2024-07-30 4201a2237ac7b724989e93f8ac4ae16da2800528

 wechat_jiaxuan/components/disProduct/index.less

@@ -169,17 +169,16 @@
    .goods_list {
      height: calc( 100% -  182rpx);
      width: 590rpx;
      display: flex;
      flex-wrap: wrap;
      box-sizing: border-box;
      justify-content: space-between;
      padding: 12rpx 40rpx;
      .item {
        float: left;
        width: 242rpx;
        flex-shrink: 0;
        margin-right: 26rpx;
        margin-bottom: 32rpx;
        &:nth-last-child(1){
          margin-right: auto;
        &:nth-of-type(2n){
          margin-right: 0;
        }
        .img_wrap {
          width: 242rpx;