From a780960caad29d9b4cfc20145ebdca571e20f3b2 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 13 Oct 2023 15:12:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/realstore/detail/detail.css |   4 +-
 pages/plugins/seckill/index/index.css     |   4 +
 pages/plugins/seckill/index/index.vue     | 114 ++++++++++------------
 3 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
index 562f6d72..1d078140 100644
--- a/pages/plugins/realstore/detail/detail.css
+++ b/pages/plugins/realstore/detail/detail.css
@@ -108,14 +108,14 @@
  * 中间内容
  */
 .content {
-    height: calc(100vh - 358rpx - var(--status-bar-height) - 10rpx);
+    height: calc(100vh - 382rpx - var(--status-bar-height) - 5px);
     /* #ifdef H5 */
     height: calc(100vh - 358rpx);
     /* #endif */
 }
 
 .content.content-tablecode {
-    height: calc(100vh - 402rpx - var(--status-bar-height) - 10rpx);
+    height: calc(100vh - 426rpx - var(--status-bar-height) - 5px);
     /* #ifdef H5 */
     height: calc(100vh - 402rpx);
     /* #endif */
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
index 0cca1d83..84598adc 100644
--- a/pages/plugins/seckill/index/index.css
+++ b/pages/plugins/seckill/index/index.css
@@ -5,6 +5,10 @@
     width: 142rpx;
 }
 
+.seckill-right-title {
+    padding-right: 40rpx;
+}
+
 .nav_seckill .item {
     width: 176rpx;
     padding: 26rpx 0;
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index ea2a5d53..d38afbab 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -1,73 +1,61 @@
 <template>
     <view>
-        <view v-if="(data_base || null) != null">
-            <component-nav-back :prop-fixed="false" :prop-style="seckill_bg">
-                <template slot="right" :class="status_bar_height > 0 ? 'top-search-width' : 'flex-1 flex-width'">
-                    <view class="flex-1 tc">
-                        <image :src="seckill_title_url" mode="widthFix" class="title pr top-sm"></image>
-                    </view>
-                </template>
-                <template slot="content">
-                    <!-- 秒杀时段 -->
-                    <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="top-nav-scroll wh-auto">
-                        <view class="nav_seckill flex-row flex-nowrap cr-white tc">
-                            <view
-                                v-for="(item, index) in periods_list"
-                                :key="index"
-                                class="item text-size-xss"
-                                :class="nav_active_index === index ? 'active' : ''"
-                                :id="'one-nav-item-' + index"
-                                :data-index="index"
-                                :data-text="item.time.time_first_text"
-                                :data-status="item.time.status"
-                                @tap="nav_event"
-                            >
-                                <view class="time text-size-lg">{{ item.name }}</view>
-                                <view class="state text-size-xs round" :class="nav_active_index === index ? 'cr-main' : ''">{{ item.time.msg }}</view>
-                            </view>
-                        </view>
-                    </scroll-view>
-                </template>
-            </component-nav-back>
-            <scroll-view :scroll-top="scroll_top" scroll-y="true" class="scroll-y" @scroll="scroll_event">
-                <view class="padding-horizontal-main padding-top-main">
-                    <!-- 基础信息、倒计时 -->
-                    <view class="oh spacing-mb flex-row jc-sb align-c">
-                        <view>
-                            <text :class="'va-m text-size-xs fw-b cr-blak ' + (is_valid == 1 ? 'cr-base' : 'cr-red')">{{ time_first_text }}</text>
-                            <view v-if="is_valid == 1" class="dis-inline-block va-m margin-left-sm">
-                                <component-countdown :propHour="time.hours" :propMinute="time.minutes" :propSecond="time.seconds" :prop-time-background-color="seckill_status === 1 ? '#E22C08' : '#333333'"></component-countdown>
-                            </view>
-                        </view>
-                        <view v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" class="text-size-xs cr-blak" @tap="quick_open_event">
-                            活动规则
-                            <iconfont name="icon-miaosha-hdgz" size="26rpx" class="margin-left-xs pr top-xs" color="#999"></iconfont>
+        <component-nav-back :prop-fixed="false" :prop-style="seckill_bg">
+            <template slot="right" class="flex-1 flex-width seckill-right-title">
+                <view class="flex-1 seckill-right-title tc">
+                    <image :src="seckill_title_url" mode="widthFix" class="title pr top-md"></image>
+                </view>
+            </template>
+            <template v-if="periods_list.length > 0" slot="content">
+                <!-- 秒杀时段 -->
+                <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'one-nav-item-' + nav_active_index" class="top-nav-scroll wh-auto">
+                    <view class="nav_seckill flex-row flex-nowrap cr-white tc">
+                        <view v-for="(item, index) in periods_list" :key="index" class="item text-size-xss" :class="nav_active_index === index ? 'active' : ''" :id="'one-nav-item-' + index" :data-index="index" :data-text="item.time.time_first_text" :data-status="item.time.status" @tap="nav_event">
+                            <view class="time text-size-lg">{{ item.name }}</view>
+                            <view class="state text-size-xs round" :class="nav_active_index === index ? 'cr-main' : ''">{{ item.time.msg }}</view>
                         </view>
                     </view>
-
-                    <!-- 商品 -->
-                    <view v-if="goods.length > 0">
-                        <component-goods-list :propData="{ style_type: 1, goods_list: goods }" :propCurrencySymbol="currency_symbol" :prop-grid-btn-config="grid_btn_config" :prop-is-open-grid-btn-set="isOpenGridBtnSet" propPriceField="seckill_min_price"></component-goods-list>
+                </scroll-view>
+            </template>
+        </component-nav-back>
+        <scroll-view v-if="periods_list.length > 0" :scroll-top="scroll_top" scroll-y="true" class="scroll-y" @scroll="scroll_event">
+            <view class="padding-horizontal-main padding-top-main">
+                <!-- 基础信息、倒计时 -->
+                <view class="oh spacing-mb flex-row jc-sb align-c">
+                    <view>
+                        <text :class="'va-m text-size-xs fw-b cr-blak ' + (is_valid == 1 ? 'cr-base' : 'cr-red')">{{ time_first_text }}</text>
+                        <view v-if="is_valid == 1" class="dis-inline-block va-m margin-left-sm">
+                            <component-countdown :propHour="time.hours" :propMinute="time.minutes" :propSecond="time.seconds" :prop-time-background-color="seckill_status === 1 ? '#E22C08' : '#333333'"></component-countdown>
+                        </view>
                     </view>
-                    <view v-else>
-                        <!-- 提示信息 -->
-                        <component-no-data propStatus="0" propMsg="没有相关商品"></component-no-data>
+                    <view v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" class="text-size-xs cr-blak" @tap="quick_open_event">
+                        活动规则
+                        <iconfont name="icon-miaosha-hdgz" size="26rpx" class="margin-left-xs pr top-xs" color="#999"></iconfont>
                     </view>
                 </view>
-                <!-- 结尾 -->
-                <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
-                <!-- 弹窗 -->
-                <component-popup v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
-                    <view class="rule">
-                        <view class="title cr-black text-size-md fw-b margin-bottom-main tc">活动规则</view>
-                        <scroll-view :scroll-y="true" class="item">
-                            <view v-for="(item, index) in data_base.content_notice" :key="index" class="cr-grey text-size-md">{{ item }}</view>
-                        </scroll-view>
-                        <button type="default" class="bg-main cr-white round text-size-md pa bottom-0 left-0 right-0" @tap="quick_close_event">知道了</button>
-                    </view>
-                </component-popup>
-            </scroll-view>
-        </view>
+
+                <!-- 商品 -->
+                <view v-if="goods.length > 0">
+                    <component-goods-list :propData="{ style_type: 1, goods_list: goods }" :propCurrencySymbol="currency_symbol" :prop-grid-btn-config="grid_btn_config" :prop-is-open-grid-btn-set="isOpenGridBtnSet" propPriceField="seckill_min_price"></component-goods-list>
+                </view>
+                <view v-else>
+                    <!-- 提示信息 -->
+                    <component-no-data propStatus="0" propMsg="没有相关商品"></component-no-data>
+                </view>
+            </view>
+            <!-- 结尾 -->
+            <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
+            <!-- 弹窗 -->
+            <component-popup v-if="(data_base.content_notice || null) != null && data_base.content_notice.length > 0" :propShow="popup_status" :propIsBar="propIsBar" propPosition="bottom" @onclose="quick_close_event">
+                <view class="rule">
+                    <view class="title cr-black text-size-md fw-b margin-bottom-main tc">活动规则</view>
+                    <scroll-view :scroll-y="true" class="item">
+                        <view v-for="(item, index) in data_base.content_notice" :key="index" class="cr-grey text-size-md">{{ item }}</view>
+                    </scroll-view>
+                    <button type="default" class="bg-main cr-white round text-size-md pa bottom-0 left-0 right-0" @tap="quick_close_event">知道了</button>
+                </view>
+            </component-popup>
+        </scroll-view>
         <view v-else>
             <!-- 提示信息 -->
             <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>