Commit 8e52bf70 by 谢中龙

修改商品活动

parent a01c820e
...@@ -789,10 +789,15 @@ wxService.page({ ...@@ -789,10 +789,15 @@ wxService.page({
if (result == 0) { if (result == 0) {
wx.hideLoading() wx.hideLoading()
let skuList = data.tradePreviewSkus; let skuList = data.tradePreviewSkus;
//参与活动列表
let skuPromotionList = data.skuPromotions ? data.skuPromotions : [];
let sum = 0 let sum = 0
skuList.forEach((item, index) => { skuList.forEach((item, index) => {
// item.price // item.price
sum += skuList[index].price * skuList[index].count; sum += skuList[index].price * skuList[index].count;
//查找促销活动
let skuPromotions = skuPromotionList.filter(sp => sp.skuId == item.skuId);
item.skuPromotions = skuPromotions;
}); });
this.data.totalGoodsPrice = sum; this.data.totalGoodsPrice = sum;
......
...@@ -93,6 +93,12 @@ ...@@ -93,6 +93,12 @@
<text class="price">¥{{item.price}}</text> <text class="price">¥{{item.price}}</text>
<text class="number">x {{item.count}}</text> <text class="number">x {{item.count}}</text>
</view> </view>
<view class="promotion-tags" wx:if="{{item.skuPromotions.length != 0}}">
<view class="promotion-level-name"
wx:for="{{item.skuPromotions}}"
wx:key="*this"
wx:for-item="skuPromotion">{{skuPromotion.levelDesc}}</view>
</view>
</view> </view>
</view> </view>
</block> </block>
......
...@@ -492,6 +492,24 @@ ...@@ -492,6 +492,24 @@
margin-left: 14rpx; margin-left: 14rpx;
} }
.promotion-tags{
display: flex;
align-items: center;
flex-wrap: wrap;
margin-top: 10rpx;
}
.promotion-tags .promotion-level-name{
width: auto;
height: auto;
padding: 5rpx 15rpx;
font-size: 20rpx;
background: rgba(203,60,60,0.3);
color: #cb3c3c;
margin-right: 15rpx;
border-radius: 4rpx;
}
.clear-box{ .clear-box{
box-sizing: border-box; box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment