From 0b934f32a875dd17a377f2efffce13ffcde8f8c5 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 15 Apr 2024 17:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BC=98=E5=8C=96=EF=BC=8C=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=89=B9=E5=8F=91=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/buy/buy.vue                   | 15 +++++++++------
 pages/goods-detail/goods-detail.vue |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 1cb9b4f7..71f96f91 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -201,9 +201,9 @@
                     </view>
                     
                     <!-- 支付选择 -->
-                    <view v-if="(total_price > 0 && common_order_is_booking != 1 && payment_list.length > 0) || ((plugins_coin_data || null) != null && (plugins_coin_data.accounts_list || null) != null &&  plugins_coin_data.accounts_list.length > 0)" class="payment-list border-radius-main bg-white oh padding-main spacing-mb">
+                    <view v-if="(total_price > 0 && common_order_is_booking != 1 && payment_list.length > 0) || plugins_coin_is_valid" class="payment-list border-radius-main bg-white oh padding-main spacing-mb">
                         <!-- 虚拟币支付 -->
-                        <block v-if="(plugins_coin_data || null) != null && (plugins_coin_data.accounts_list || null) != null &&  plugins_coin_data.accounts_list.length > 0">
+                        <block v-if="plugins_coin_is_valid">
                             <block v-for="(item, index) in plugins_coin_data.accounts_list" :key="index">
                                 <view class="item flex-row jc-sb align-c" :data-value="item.id" @tap="plugins_coin_payment_event">
                                     <view class="item-content pr flex-row align-c">
@@ -223,7 +223,7 @@
                             </block>
                         </block>
                         <!-- 支付方式 -->
-                        <view v-if="total_price > 0 && common_order_is_booking != 1 && payment_list.length > 0" class="br-t-f9">
+                        <view v-if="total_price > 0 && common_order_is_booking != 1 && payment_list.length > 0" :class="(plugins_coin_is_valid ? 'br-t-f9' : '')">
                             <view v-for="(item, index) in payment_list" :key="index">
                                 <view class="item flex-row jc-sb align-c" :data-value="item.id" :data-index="index" @tap="payment_event">
                                     <view class="item-content pr flex-1 flex-width">
@@ -400,7 +400,8 @@
                 // 运费
                 plugins_freightfee_choice_data: {},
                 // 虚拟币
-                plugins_coin_data: null,
+                plugins_coin_data: null,
+                plugins_coin_is_valid: false,
                 plugins_coin_payment_id: 0,
 
                 // 支付弹窗参数
@@ -612,7 +613,8 @@
                                     goods_list[i]['order_base']['extension_data'] = temp_extension_data;
                                 }
 
-                                // 设置数据
+                                // 设置数据
+                                var plugins_coin_data = data.plugins_coin_data || null;
                                 this.setData({
                                     goods_list: goods_list,
                                     total_price: data.base.actual_price,
@@ -624,7 +626,8 @@
                                     plugins_points_data: data.plugins_points_data || null,
                                     plugins_realstore_data: data.plugins_realstore_data || null,
                                     plugins_intellectstools_data: data.plugins_intellectstools_data || null,
-                                    plugins_coin_data: data.plugins_coin_data || null,
+                                    plugins_coin_data: plugins_coin_data,
+                                    plugins_coin_is_valid:  plugins_coin_data != null && (plugins_coin_data.accounts_list || null) != null &&  plugins_coin_data.accounts_list.length > 0,
                                 });
 
                                 // 可使用积分数量
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index dd7f6142..30b0eaa4 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -902,7 +902,7 @@
                                 buy_button: data.buy_button || null,
                                 top_nav_title_data: data.middle_tabs_nav || [],
                                 plugins_seckill_data: plugins_seckill_data,
-                                plugins_seckill_is_valid:  (plugins_seckill_data || null) != null && (plugins_seckill_data.time || null) != null && plugins_seckill_data.time.status == 1,
+                                plugins_seckill_is_valid:  plugins_seckill_data != null && (plugins_seckill_data.time || null) != null && plugins_seckill_data.time.status == 1,
                                 plugins_coupon_data: data.plugins_coupon_data || null,
                                 quick_nav_cart_count: data.cart_total.buy_number || 0,
                                 plugins_salerecords_data: data.plugins_salerecords_data || null,