From 5fd7b0385a2988b871ab5c2c26c40fd1dae05f27 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 8 Nov 2023 08:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/popup/popup.vue            | 14 ++++++++------
 components/quick-nav/quick-nav.vue    |  2 +-
 pages/goods-detail/goods-detail.vue   |  6 +++---
 pages/plugins/seckill/index/index.vue |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index eab29187..270d69e2 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -91,12 +91,14 @@
             },
             // 左边距位置处理
             left_handle() {
-                // 处理内容左边距、避免父级设置内边距影响
-                var width = uni.getSystemInfoSync().windowWidth;
-                var left = 0;
-                if (width > 800) {
-                    left = (width - 800) / 2;
-                }
+                var left = 0;
+                // #ifdef H5
+                // 处理内容左边距、避免父级设置内边距影响
+                var width = uni.getSystemInfoSync().windowWidth;
+                if (width > 800) {
+                    left = (width - 800) / 2;
+                }
+                // #endif
                 this.popup_content_left_value = left + 'px';
             },
         },
diff --git a/components/quick-nav/quick-nav.vue b/components/quick-nav/quick-nav.vue
index a75054d1..9282603b 100644
--- a/components/quick-nav/quick-nav.vue
+++ b/components/quick-nav/quick-nav.vue
@@ -84,7 +84,7 @@
             this.init_config();
 
             // 页面是否定义导航
-            var value = this.propIsNav ? 80 : 0;
+            var value = this.propIsNav ? 100 : 0;
             this.top = value;
             this.height_dec = value;
             // #ifdef H5 || APP
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 3a4a856e..350c47b5 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -81,9 +81,9 @@
             </view>
 
             <!-- 价格信息 -->
-            <view :class="'goods-base-price bg-white oh spacing-mb ' + ((plugins_seckill_data || null) != null ? 'goods-base-price-countdown' : '')">
+            <view :class="'goods-base-price bg-white oh spacing-mb ' + ((plugins_seckill_data || null) != null && plugins_seckill_data.time.status == 1 ? 'goods-base-price-countdown' : '')">
                 <!-- 价格 -->
-                <view class="price-content padding-lg bs-bb fl" :style="(plugins_seckill_data || null) != null ? 'background-image: url(' + plugins_seckill_data.goods_detail_header + ')' : ''">
+                <view class="price-content padding-lg bs-bb fl" :style="(plugins_seckill_data || null) != null && plugins_seckill_data.time.status == 1 ? 'background-image: url(' + plugins_seckill_data.goods_detail_header + ')' : ''">
                     <view class="single-text">
                         <text v-if="(show_field_price_text || null) != null" class="price-icon round va-m">{{ show_field_price_text }}</text>
                         <text class="sales-price va-m">{{ currency_symbol }}{{ goods_spec_base_price }}</text>
@@ -91,7 +91,7 @@
                     <view v-if="(goods_spec_base_original_price || null) != null && goods_spec_base_original_price != 0" class="original-price margin-top-sm single-text">{{ currency_symbol }}{{ goods_spec_base_original_price }}</view>
                 </view>
                 <!-- 秒杀 -->
-                <view v-if="(plugins_seckill_data || null) != null" class="countdown-content padding-top-lg padding-bottom-lg padding-left-xs padding-right-xs fr tc">
+                <view v-if="(plugins_seckill_data || null) != null && plugins_seckill_data.time.status == 1" class="countdown-content padding-top-lg padding-bottom-lg padding-left-xs padding-right-xs fr tc">
                     <view class="time-title cr-white single-text">{{ plugins_seckill_data.goods_detail_title || '限时秒杀' }}</view>
                     <component-countdown
                         :propHour="plugins_seckill_data.time.hours"
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index 8bf0c32d..1869e3f7 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -180,7 +180,7 @@
                             var current = data.current || null;
                             var time = current == null ? null : current.time || null;
                             var goods = current == null ? [] : current.goods || [];
-                            var is_valid = time == null ? 0 : time.status == 1 ? 1 : 0;
+                            var is_valid = time == null ? 0 : time.status <= 1 ? 1 : 0;
                             if (goods.length > 0) {
                                 for (var i in goods) {
                                     goods[i]['price_icon'] = is_valid == 1 ? current.goods_detail_icon || '秒杀价' : '';