Merge branch 'feature/cartPromotionTip' into release/5.7

@@ -265,7 +265,7 @@ const formatPromotionInfos = (infoList) => {
         return {
             cutdownAmount: it.cutdown_amount,
             promotionId: it.promotion_id,
-            promotionDesc: identIconReplace(it.promotion_desc),
+            promotionDesc: identIconReplace(it.promotion_title),
             promotionType: it.promotion_type,
             tag: PROMOTION_TYPE_TAG_MAP[it.promotion_type]
         };
@@ -376,16 +376,15 @@ const checkGoodsIsSel = (goodsList, promotionId, selectedGiftsList) => {
  */
 const formatPromotion = (it, selectedGiftsList) => {
 
+    // "status": 0, // 状态 0 未满足 10 已满足 [20 售光 30 更换 ]
     let status = parseInt(it.status, 10);
     let info = {
         status: status,
-
-        // "status": 0, // 状态 0 未满足 10 已满足 [20 售光 30 更换 ]
         conditionUnit: it.condition_unit,   // 0满足,1 件,2金额
         conditionValue: it.condition_value,
         giftPrice: it.gift_price,   // 赠品或加价购商品价格
         giftGoodsList: formatCartGoods(it.gift_goods_List),  // 可供选择的赠品或加价购商品列表
-        promotionId: it.promotion_id, // 促销id
+        promotionId: it.ts_promotion_ids.join(','), // 促销id
         promotionDesc: identIconReplace(it.promotion_desc),
         promotionType: it.promotion_type,  // 促销类型
         // list.yohobuy.com?psp_id=10408