From 9267aaf93ac412f45dd12dfdccdedf9c4b0027ed Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 17 Dec 2021 17:56:57 +0800
Subject: [PATCH] 阶梯购买的bug优化 1.  商品详情也要显示折数 2.  计算超出阶梯数量的折扣计算问题

---
 components/goods_list/goods_list.wxml     | 2 +-
 pages/cart/cart2/ladder_calculate.js      | 5 +++--
 pages/user/order_detail/order_detail.wxml | 2 +-
 pages/user/order_list/order_list.wxml     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 3be78b8..59ea85c 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -15,7 +15,7 @@
           <!-- 商品名称 -->
           <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
           <!-- 判断是否有活动价 -->
-          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7}}">
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
 						<view class="pdt10">
 							<view class="money flex xc-wc" >
 							<text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
diff --git a/pages/cart/cart2/ladder_calculate.js b/pages/cart/cart2/ladder_calculate.js
index ec1c9aa..218aff0 100644
--- a/pages/cart/cart2/ladder_calculate.js
+++ b/pages/cart/cart2/ladder_calculate.js
@@ -103,14 +103,15 @@ module.exports = {
                     new_g.prom_type = 0;
                     new_g.prom_id = 0;
                     goods.push(new_g);
-                    goods.splice(idx, 1);
+                    //goods.splice(idx, 1);
                 }
             }
 
+            //-- 最后剔除不要参与的数据 --
             for(var h in del_g){
                 var it=del_g[h];
                 let idx = goods.findIndex(function (ele) {
-                    return ele.goods_id == it.goods_id;
+                    return ele.goods_id == it.goods_id
                 })
                 goods.splice(idx, 1);
             }
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index a3e3417..a5e4c00 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -32,7 +32,7 @@
             </navigator>
 
             <view class="order-num">
-                <view class="goods-price">￥{{item.member_goods_price}}</view>
+                <view class="goods-price">￥{{item.member_goods_price}}<text wx:if="{{item.prom_type==10}}" style="margin-left: 5rpx">({{item.ladder_discount}}折)</text> </view>
                 <view class="goods-num">×{{item.goods_num}}</view>
 
                 <!-- 不是整单退的时候 -->
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index aeb9884..9bc26c9 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -148,7 +148,7 @@
 								<!-- 幸运购prom_type等于9 -->
 								<!-- 如果是幸运购就显示幸运购参团价格 -->
 								<view class="fs26" wx:if="{{goods.prom_type == 9}}">{{filters.toFix(goods.goods_price,2)}}</view>
-	              <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}}</view>
+	              <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}} <text wx:if="{{goods.prom_type==10}}">({{goods.ladder_discount}}折)</text> </view>
 	            </view>
 	            <view class="fs26 c-a9">x{{goods.goods_num}}</view>
 	          </view>
--
libgit2 0.21.4