合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 mini-program/pages/index/index.vue

@@ -118,7 +118,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>
@@ -276,6 +280,7 @@
               if (res.code === 200) {
                  res.data.records.forEach(item => {
                     item.minPrice = item.minPrice.toFixed(2).split('.')
                     item.shou = (item.salenum || 0) + (item.realSaleNum || 0)
                  })
                  this.goodsList.push(...res.data.records)
                  this.page++
@@ -576,6 +581,11 @@
                  box-sizing: border-box;

                  .commodity-item-box-title {
                     width: 100%;
                     display: -webkit-box;
                     -webkit-box-orient: vertical;
                     -webkit-line-clamp: 2;
                     overflow: hidden;
                     font-weight: 600;
                     font-size: 30rpx;
                     color: #222222;