合并

MrShi

19 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 mini-program/pages/mall/mall.vue

@@ -78,7 +78,11 @@
                  </view>
               </view>
               <view class="commodity-item-shou">
<<<<<<< HEAD
                  <text>已售{{item.shou}}</text>
=======
                  <text>已售{{(item.saleNum ||0)+ (item.realSaleNum||0)}}</text>
>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
                  <view class="commodity-item-shou-add" @click.stop="addCard(item)">+</view>
               </view>
            </view>
@@ -426,6 +430,7 @@
               justify-content: center;
               image {
                  width: 100%;
                  max-height:330rpx;
               }
            }
            .commodity-item-box {