From d18872f1d0ce130439f5bc6040402d88aa68923e Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 11 Jul 2024 21:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=EF=BC=8C=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                              |  6 +++
 common/css/page.css                       |  6 +--
 locale/en.json                            |  2 +
 locale/zh.json                            |  2 +
 pages/plugins/realstore/detail/detail.css |  3 ++
 pages/plugins/realstore/detail/detail.vue | 66 +++++++++++++++--------
 6 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/changelog.md b/changelog.md
index df22b5ae..40595dca 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,9 @@
+## 6.2.0.5（2024-07-11）
+1. 门店基础模式优化支持（基础、商品、基础+商品）
+2. 文章增加封面支持
+
+
+
 ## 6.2.0.4（2024-07-10）
 1. 商品详情更多门店追踪商品
 
diff --git a/common/css/page.css b/common/css/page.css
index 77281773..0988dd60 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -935,10 +935,10 @@ button[disabled].bg-grey {
 }
 .nav-active-line::before {
     content: '';
-    width: 12px;
-    height: 2px;
+    width: 24rpx;
+    height: 6rpx;
     background: transparent;
-    border-radius: 1px;
+    border-radius: 6rpx;
     position: absolute;
     left: 50%;
     bottom: 0;
diff --git a/locale/en.json b/locale/en.json
index 99175b46..676c7941 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -508,6 +508,8 @@
 			"w3jma9": "coupon",
 			"u401fi": "specifications",
 			"317jp2": "Related stores",
+            "dfge45": "Store Introduction",
+            "567uhg": "Store products",
 			"znz76d": "Evaluation",
 			"1rqkjt": "Positive review rate",
 			"6k7808": "I want to evaluate",
diff --git a/locale/zh.json b/locale/zh.json
index 504c3a54..fe548502 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -498,6 +498,8 @@
 			"w3jma9": "优惠券",
 			"u401fi": "规格",
 			"317jp2": "相关门店",
+            "dfge45": "门店介绍",
+            "567uhg": "门店商品",
 			"znz76d": "商品评价",
 			"1rqkjt": "好评率",
 			"6k7808": "我要评价",
diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
index fc713548..6c7a8886 100644
--- a/pages/plugins/realstore/detail/detail.css
+++ b/pages/plugins/realstore/detail/detail.css
@@ -94,6 +94,9 @@ page {
 .right-content-actual {
     padding-bottom: calc(105rpx + env(safe-area-inset-bottom));
 }
+.right-content-actual.base-mode-goods {
+    padding-bottom: calc(126rpx + env(safe-area-inset-bottom));
+}
 .goods-list-top-nav {
     position: sticky;
     top: 0;
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index ecf7cbd2..e515d2a6 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -8,7 +8,7 @@
                 <view class="header pr z-i">
                     <component-nav-back :propIsShowBack="is_realstore_top_nav_back == 1" :propFixed="false" propColor="#333">
                         <template slot="right" :class="is_top_search_width ? 'top-search-width' : 'flex-1 flex-width'">
-                            <view v-if="is_base_mode != 1 || is_base_mode_show_goods == 1" :class="'va-m wh-auto top-nav-search '+(is_realstore_top_nav_back == 1 ? 'padding-left-main' : '')">
+                            <view v-if="is_base_mode != 1" :class="'va-m wh-auto top-nav-search '+(is_realstore_top_nav_back == 1 ? 'padding-left-main' : '')">
                                 <block v-if="client_type == 'h5'">
                                     <component-search @onsearch="search_button_event" :propIsRequired="false" propIconColor="#333" propPlaceholderClass="cr-grey-c" :propPlaceholder="$t('detail.detail.q42ger')" propBgColor="#fff"></component-search>
                                 </block>
@@ -73,7 +73,7 @@
                                         </view>
                                         <!-- 右侧操作 -->
                                         <view class="icon-list margin-left-main">
-                                            <view v-if="(data_base || null) != null && (data_base.is_service_info || 0) == 1" class="icon-item green cr-green border-radius-sm dis-inline-block tc cp" @tap="popup_service_open_event">
+                                            <view v-if="(data_base || null) != null && is_service_info == 1" class="icon-item green cr-green border-radius-sm dis-inline-block tc cp" @tap="popup_service_open_event">
                                                 <iconfont name="icon-mendian-kefu" size="26rpx"></iconfont>
                                             </view>
                                             <view :class="'icon-item red border-radius-sm dis-inline-block tc cp pr ' + (favor_info.status == 1 ? 'cr-red' : 'cr-grey-9')" @tap="favor_event">
@@ -89,14 +89,23 @@
                         </view>
                     </view>
 
-                    <!-- 内容、是否基础模式则展示门店介绍 -->
-                    <view v-if="is_base_mode == 1 && is_base_mode_show_goods != 1" class="padding-horizontal-main padding-top-main border-radius-main bg-white">
-                        <view class="fw-b title-left-border">门店介绍</view>
-                        <scroll-view :scroll-y="true" class="margin-top-sm cr-base text-size-sm" :style="content_style">
-                            <mp-html :content="info.describe" />
+                    <!-- 门店基础模式 -->
+                    <view v-if="is_base_mode == 1 && is_base_mode_show_type == 2" class="nav-base bg-white fw-b margin-bottom-sm margin-top-sm">
+                        <block v-for="(item, index) in nav_base_list" :key="index">
+                            <view v-if="nav_base_index == index" class="item fl tc padding-horizontal-main cr-main nav-active-line" :data-index="index" @tap="nav_base_event">{{ item.name }}</view>
+                            <view v-else class="item fl tc padding-horizontal-main" :data-index="index" @tap="nav_base_event">{{ item.name }}</view>
+                        </block>
+                    </view>
+                    <!-- 门店基础模式 - 商品 -->
+                    <view v-if="is_base_mode == 1 && (is_base_mode_show_type == 0 || (is_base_mode_show_type == 2 && nav_base_index == 0))" class="padding-horizontal-main border-radius-main bg-white">
+                        <view v-if="is_base_mode_show_type == 0" class="fw-b title-left-border margin-bottom-sm margin-top-main">{{$t('goods-detail.goods-detail.dfge45')}}</view>
+                        <scroll-view :scroll-y="true" class="cr-base text-size-sm" :style="content_style">
+                            <view class="right-content-actual base-mode-goods">
+                                <mp-html :content="info.describe" />
+                            </view>
                         </scroll-view>
                     </view>
-                    <block v-else>
+                    <block v-if="is_base_mode == 0 || (is_base_mode_show_type == 1 || (is_base_mode_show_type == 2 && nav_base_index == 1))">
                         <!-- 左侧分类和右侧商品 -->
                         <view class="content oh bg-white pr flex-row jc-sb" :style="content_style">
                             <!-- 左侧 -->
@@ -117,7 +126,7 @@
                             </scroll-view>
                             <!-- 右侧 -->
                             <scroll-view :scroll-y="true" class="right-content ht-auto goods-list flex-1 flex-width" :scroll-top="scroll_top" @scroll="scroll_event" @scrolltolower="scroll_lower" lower-threshold="60">
-                                <view class="right-content-actual pr">
+                                <view :class="'right-content-actual pr '+(is_base_mode == 1 ? 'base-mode-goods' : '')">
                                     <!-- 操作导航 -->
                                     <view class="goods-list-top-nav bg-white">
                                         <!-- 排序 -->
@@ -193,7 +202,7 @@
                     <!-- 基础模式底部导航 -->
                     <view v-if="is_base_mode == 1" class="bg-white pf left-0 bottom-0 wh-auto padding-main bs-bb br-top-shadow">
                         <view class="bottom-line-exclude button-list">
-                            <view class="button-left tc">
+                            <view :class="'button-left tc '+(is_service_info == 1 ? '' : 'wh-auto')">
                                 <!-- #ifndef MP-KUAISHOU -->
                                 <view v-if="info.lat != 0 && info.lng != 0" propClass="item" @tap="address_map_event">
                                     <view>
@@ -209,7 +218,7 @@
                                     <view class="cr-base text-size-md">{{$t('common.share')}}</view>
                                 </view>
                             </view>
-                            <view class="button-right">
+                            <view v-if="is_service_info == 1" class="button-right">
                                 <button type="default" class="item br-main bg-main cr-white round text-size-md dis-block wh-auto" @tap="popup_service_open_event">{{$t('cart.cart.31h34v')}}</button>
                             </view>
                         </view>
@@ -238,7 +247,7 @@
                     </view>
                 </view>
                 <view class="popup-service-container">
-                    <view v-if="(info || null) != null && (data_base || null) != null && (data_base.is_service_info || 0) == 1" class="header-service">
+                    <view v-if="(info || null) != null && (data_base || null) != null && is_service_info == 1" class="header-service">
                         <view v-if="(info.chat_info || null) != null" class="item padding-main single-text">
                             <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
                             <view class="dis-inline-block chat-info cp" @tap="chat_event">
@@ -306,7 +315,7 @@
                 data_list_loding_msg: '',
                 data_is_loading: 0,
                 is_base_mode: 0,
-                is_base_mode_show_goods: 0,
+                is_base_mode_show_type: 0,
                 is_cart_nav: false,
                 buy_use_type_index: 0,
                 params: null,
@@ -327,6 +336,12 @@
                 nav_active_index: -1,
                 nav_active_item_index: -1,
                 popup_service_status: false,
+                // 基础导航
+                nav_base_index: 0,
+                nav_base_list: [
+                    { name: this.$t('goods-detail.goods-detail.dfge45'), value: 0 },
+                    { name: this.$t('goods-detail.goods-detail.567uhg'), value: 1 },
+                ],
                 // 下单类型
                 buy_use_type_index: 0,
                 // 排序导航
@@ -463,24 +478,26 @@
                             var data = res.data.data;
                             // 基础配置
                             var data_base = data.base || {};
+                            // 是否开启在线客服
+                            var is_service_info = parseInt(data_base.is_service_info || 0);
                             // 是否基础模式
                             var is_base_mode = parseInt(data.is_base_mode || 0);
-                            // 基础模式下是否展示商品
-                            var is_base_mode_show_goods = parseInt(data.is_base_mode_show_goods || 0);
+                            // 基础模式下是否展示类型
+                            var is_base_mode_show_type = parseInt(data.is_base_mode_show_type || 0);
                             // 桌码
                             var tablecode = data.tablecode || null;
-                            // 开启门店基础
+                            // 基础模式内容高度处理
                             var base_mode_style = '0rpx';
-                            if(is_base_mode == 1 && is_base_mode_show_goods != 1) {
-                                // 开启了联系客服有底部按钮、则仅内容高度
-                                base_mode_style = ((data_base.is_service_info || 0) == 1) ? '240rpx' : '90rpx';
+                            if(is_base_mode == 1 && (is_base_mode_show_type == 0 || is_base_mode_show_type == 2)) {
+                                base_mode_style = (is_base_mode_show_type == 0) ? '58rpx' : '92rpx';
                             }
                             // 内容高度
                             var content_style = 'height: calc(100vh - '+(this.client_type == 'h5' ? '386rpx' : '374rpx')+' - '+this.status_bar_height+'px - '+(tablecode == null ? '0rpx' : '44rpx')+ ' - '+base_mode_style+');';
 
                             this.setData({
+                                is_service_info: is_service_info,
                                 is_base_mode: is_base_mode,
-                                is_base_mode_show_goods: is_base_mode_show_goods,
+                                is_base_mode_show_type: is_base_mode_show_type,
                                 is_cart_nav: true,
                                 data_base: data_base,
                                 info: data.info || null,
@@ -534,7 +551,7 @@
                                 // 获取数据、仅首次调用，获取列表接口
                                 if (this.is_first == 1) {
                                     // 是否基础模式
-                                    if(this.is_base_mode != 1 || is_base_mode_show_goods == 1) {
+                                    if(this.is_base_mode != 1 || is_base_mode_show_type != 0) {
                                         this.get_data_list();
                                     }
                                     // 非首次记录
@@ -997,6 +1014,13 @@
                         share_info: this.share_info
                     });
                 }
+            },
+
+            // 基础导航事件
+            nav_base_event(e) {
+                this.setData({
+                    nav_base_index: e.currentTarget.dataset.index,
+                });
             }
         },
     };