From b78b3f03f30973897cc23fc9f620d9b3f82dd97f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 7 Apr 2023 23:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E6=90=AD=E9=85=8D=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                      |  1 +
 components/binding-list/binding-list.vue |  2 +-
 pages/plugins/binding/detail/detail.vue  | 49 +++++++++++++++++-------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 0f4679a1..a46ec8fd 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -774,6 +774,7 @@ button[disabled].bg-gray {
     left: 0;
     background: rgb(253 253 253 / 80%);
     z-index: 1;
+    filter: blur(0.3px);
 }
 .goods-data-grid-list .item .error-msg,
 .goods-data-rolling-list .item .error-msg {
diff --git a/components/binding-list/binding-list.vue b/components/binding-list/binding-list.vue
index 54c41cbd..b0a334ff 100644
--- a/components/binding-list/binding-list.vue
+++ b/components/binding-list/binding-list.vue
@@ -4,7 +4,7 @@
             <!-- 组合搭配 -->
             <block v-if="((propData.binding_list || null) != null)">
                 <block v-for="(bv, bi) in propData.binding_list" :key="bi">
-                    <view v-if="((bv.goods || null) != null) && bv.goods.length > 0" class="plugins-binding-list padding-horizontal-main border-radius-main oh">
+                    <view v-if="((bv.goods || null) != null) && bv.goods.length > 0" class="plugins-binding-list padding-horizontal-main border-radius-main oh spacing-mb">
                         <view class="spacing-nav-title oh">
                             <text class="text-wrapper">{{bv.title}}</text>
                             <view v-if="(bv.estimate_discount_price || 0) != 0" class="estimate-discount-price fr">
diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue
index 6bb32a47..16809699 100644
--- a/pages/plugins/binding/detail/detail.vue
+++ b/pages/plugins/binding/detail/detail.vue
@@ -224,33 +224,56 @@
                 // 已选商品
                 var min_price = 0;
                 var max_price = 0;
+                var min_original_price = 0;
+                var max_original_price = 0;
+                var price = 0;
+                var discount_price = 0;
                 for(var i in goods) {
-                    if(goods[i]['checked'] == undefined || goods[i]['checked'] == true) {
+                    if((goods[i]['checked'] == undefined || goods[i]['checked'] == true) && goods[i]['is_error'] == 0) {
                         min_price += parseFloat(goods[i]['min_price'] || 0);
                         max_price += parseFloat(goods[i]['max_price'] || 0);
+                        min_original_price += parseFloat(goods[i]['min_original_price'] || 0);
+                        max_original_price += parseFloat(goods[i]['max_original_price'] || 0);
                     }
                 }
 
-                // 优惠计算
+                // 价格信息
+                price = parseFloat(temp_data.price || 0);
                 var rate = parseFloat(temp_data.rate || 0);
-                var discount_price = 0;
-                if(min_price == max_price) {
-                    if(rate > 0) {
-                        var price = app.globalData.price_two_decimal(min_price*rate);
-                        var discount_price = app.globalData.price_two_decimal(min_price-price) || 0;
+                // 组合价
+                if(price > 0) {
+                    if(min_price == max_price) {
+                        var original_price = min_price;
+                        var dv = parseFloat(app.globalData.price_two_decimal(original_price-price));
+                        discount_price = (dv <= 0) ? 0 : dv;
                     } else {
-                        var price = min_price;
+                        var original_price = min_price+'-'+max_price;
+                        var d1 = parseFloat(app.globalData.price_two_decimal(min_price-price));
+                        var d2 = parseFloat(app.globalData.price_two_decimal(max_price-price));
+                        discount_price = (d1 == d2) ? d1 : ((d1 <= 0 && d2 <= 0) ? 0 : (d1 <= 0 ? 0 : d1)+'-'+(d2 <= 0 ? 0 : d2));
                     }
                 } else {
+                    // 折扣率
                     if(rate > 0) {
-                        var temp_min = app.globalData.price_two_decimal(min_price*rate);
-                        var temp_max = app.globalData.price_two_decimal(max_price*rate);
-                        var price = temp_min+'-'+temp_max;
-                        var discount_price = app.globalData.price_two_decimal(min_price-temp_min)+'-'+app.globalData.price_two_decimal(max_price-temp_max);
+                        min_original_price = min_price;
+                        max_original_price = max_price;
+                        min_price = min_price*rate;
+                        max_price = max_price*rate;
+                    }
+
+                    price = (min_price != max_price) ? min_price+'-'+max_price : min_price;
+                    var original_price = (min_original_price != max_original_price) ? min_original_price+'-'+max_original_price : min_original_price;
+                    if(price.toString().indexOf('-') == -1 && original_price.toString().indexOf('-') == -1)
+                    {
+                        var dv = parseFloat(app.globalData.price_two_decimal(original_price-price));
+                        discount_price = (dv <= 0) ? 0 : dv;
                     } else {
-                        var price = app.globalData.price_two_decimal(min_price)+'-'+app.globalData.price_two_decimal(max_price);
+                        var d1 = parseFloat(app.globalData.price_two_decimal(min_original_price-min_price));
+                        var d2 = parseFloat(app.globalData.price_two_decimal(max_original_price-max_price));
+                        discount_price = (d1 == d2) ? d1 : ((d1 <= 0 && d2 <= 0) ? 0 : (d1 <= 0 ? 0 : d1)+'-'+(d2 <= 0 ? 0 : d2));
                     }
                 }
+
                 // 购买价格
                 temp_data['estimate_price'] = price;
                 // 节省价格