From aa92bbcebff4c5d1478070be6af153ab20cdae69 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 10 May 2023 23:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 074e8413..688fc16f 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -9,8 +9,7 @@
                             <view :class="'cart-goods-item padding-main pr ' + (common_site_type == 1 ? 'cart-exhibition-mode-data' : '')">
                                 <!-- 选择 -->
                                 <view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="fl cart-selected">
-                                    <image v-if="(item.is_error || 0) != 1" class="icon" :src="common_static_url+'select' + ((item.is_error || 0) == 1 ? '-disabled' : ((item.selected || false) ? '-active' : '')) + '-icon.png'" mode="widthFix"></image>
-                                    <text v-if="(item.is_error || 0) == 1" class="cr-grey">失效</text>
+                                    <image class="icon" :src="common_static_url+'select' + ((item.selected || false) ? '-active' : '') + '-icon.png'" mode="widthFix"></image>
                                 </view>
 
                                 <view class="items oh padding-left-sm">
@@ -84,7 +83,7 @@
                     </view>
                 </view>
                 <view class="fr cart-nav-submit padding-top padding-bottom padding-horizontal-main">
-                    <button class="bg-main cr-white round text-size-lg" type="default" @tap="buy_submit_event" :disabled="!already_selected_status" hover-class="none">结算</button>
+                    <button class="bg-main cr-white round text-size-lg" type="default" @tap="buy_submit_event" :disabled="!already_valid_selected_status" hover-class="none">结算</button>
                 </view>
             </view>
         </view>
@@ -121,6 +120,7 @@
                 total_price: '0.00',
                 is_selected_all: false,
                 already_selected_status: false,
+                already_valid_selected_status: false,
                 source_type: null,
                 // 基础配置
                 currency_symbol: app.globalData.data.currency_symbol,
@@ -507,18 +507,14 @@
                         // 批量操作
                         case 'all':
                             temp_is_selected_all = temp_is_selected_all == true ? false : true;
-                            for (var i in temp_data_list) {
-                                if (temp_data_list[i]['is_error'] != 1) {
-                                    temp_data_list[i]['selected'] = temp_is_selected_all;
-                                }
+                            for (var i in temp_data_list) {
+                                temp_data_list[i]['selected'] = temp_is_selected_all;
                             }
                             break;
                             // 节点操作
                         case 'node':
-                            var index = e.currentTarget.dataset.index || 0;
-                            if (temp_data_list[index]['is_error'] != 1) {
-                                temp_data_list[index]['selected'] = temp_data_list[index]['selected'] == true ? false : true;
-                            }
+                            var index = e.currentTarget.dataset.index || 0;
+                            temp_data_list[index]['selected'] = temp_data_list[index]['selected'] == true ? false : true;
                             break;
                     }
 
@@ -540,20 +536,21 @@
                 var selected_count = 0;
                 var temp_data_list = this.data_list;
                 for (var i in temp_data_list) {
-                    if ((temp_data_list[i]['is_error'] || 0) == 0) {
-                        data_count++;
-                    }
-                    if ((temp_data_list[i]['selected'] || false) == true) {
-                        total_price += parseInt(temp_data_list[i]['stock']) * parseFloat(temp_data_list[i]['price']);
-                        selected_count++;
+                    if ((temp_data_list[i]['selected'] || false) == true) {
+                        selected_count++;
+                        if ((temp_data_list[i]['is_error'] || 0) == 0) {
+                            data_count++;
+                            total_price += parseInt(temp_data_list[i]['stock']) * parseFloat(temp_data_list[i]['price']);
+                        }
                     }
                     cart_total += parseInt(temp_data_list[i]['stock']);
                 }
 
                 this.setData({
                     total_price: total_price.toFixed(2),
-                    already_selected_status: selected_count > 0,
-                    is_selected_all: selected_count > 0 && selected_count >= data_count
+                    already_selected_status: selected_count > 0,
+                    already_valid_selected_status: data_count > 0,
+                    is_selected_all: selected_count > 0 && selected_count >= temp_data_list.length
                 });
                 if (cart_total <= 0) {
                     app.globalData.set_tab_bar_badge(2, 0);
@@ -568,7 +565,7 @@
                 var ids = [];
                 var temp_data_list = this.data_list || [];
                 for (var i in temp_data_list) {
-                    if ((temp_data_list[i]['selected'] || false) == true) {
+                    if ((temp_data_list[i]['is_error'] || 0) == 0 && (temp_data_list[i]['selected'] || false) == true) {
                         ids.push(temp_data_list[i]['id']);
                         selected_count++;
                     }