From 514f2d083d53099f7028df5f3669390d4d419509 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 6 May 2024 00:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=96=B0=E5=A2=9E=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/page.css                          |   8 +-
 components/realstore-list/realstore-list.vue |   2 +-
 pages/goods-detail/goods-detail.vue          |   2 +-
 pages/plugins/binding/detail/detail.vue      |   7 +-
 pages/plugins/realstore/detail/detail.css    |  25 +-
 pages/plugins/realstore/detail/detail.vue    | 300 +++++++++++--------
 pages/plugins/shop/design/design.vue         |   2 +-
 pages/plugins/shop/detail/detail.vue         |   2 +-
 pages/plugins/signin/detail/detail.vue       |   8 +-
 static/icon/iconfont.css                     |   6 +-
 static/icon/iconfont.ttf                     | Bin 22440 -> 22588 bytes
 11 files changed, 221 insertions(+), 141 deletions(-)

diff --git a/common/css/page.css b/common/css/page.css
index 0c51745c..fc23065d 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -1084,12 +1084,12 @@ button[disabled].bg-grey {
 */
 .header-service {
     width: 430rpx;
-    left: 80rpx;
-    top: 240rpx;
+    left: calc(50% - 215rpx);
+    top: calc(50vh - 360rpx);
     z-index: 10;
     font-size: 24rpx;
-    -webkit-box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
-    box-shadow: 0 10px 10px rgb(0 0 0 / 30%);
+    -webkit-box-shadow: 0 0 100px rgb(0 0 0 / 30%);
+    box-shadow: 0 0 100px rgb(0 0 0 / 30%);
 }
 .header-service .item:first-child {
     border-top: 0 !important;
diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue
index 9a879a9b..29b2524d 100644
--- a/components/realstore-list/realstore-list.vue
+++ b/components/realstore-list/realstore-list.vue
@@ -34,7 +34,7 @@
                     </view>
                     <!-- 右侧操作 -->
                     <view class="icon-list pa">
-                        <view v-if="(item.contacts_tel || null) != null" class="icon-item dis-inline-block tc cp" :data-value="item.contacts_tel" @tap.stop="tel_event">
+                        <view v-if="(item.service_data || null) != null && (item.service_data.service_tel || null) != null" class="icon-item dis-inline-block tc cp" :data-value="item.service_data.service_tel" @tap.stop="tel_event">
                             <iconfont name="icon-md-phone" size="40rpx"></iconfont>
                         </view>
                         <!-- #ifndef MP-KUAISHOU -->
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 51ca2d53..5e86f0d9 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -475,7 +475,7 @@
                 </view>
             </block>
             <view v-else class="goods-buy-nav oh wh-auto bg-white br-top-shadow bottom-line-exclude flex-row jc-sb align-c">
-                <button class="bg-white br-white round tc text-size-md wh-auto margin-horizontal-main" type="default" :loading="true">{{ $t('realstore-cart.realstore-cart.50lf68') }}</button>
+                <button class="bg-white br-white round tc text-size-md wh-auto margin-horizontal-main cr-grey" type="default" :loading="true">{{ $t('realstore-cart.realstore-cart.50lf68') }}</button>
             </view>
 
             <!-- 商品参数弹窗 -->
diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue
index 54365032..6204610d 100644
--- a/pages/plugins/binding/detail/detail.vue
+++ b/pages/plugins/binding/detail/detail.vue
@@ -94,9 +94,6 @@
 
             <!-- 结尾 -->
             <component-bottom-line :propStatus="data_bottom_line_status"></component-bottom-line>
-
-            <!-- 分享弹窗 -->
-            <component-share-popup ref="share"></component-share-popup>
         </view>
         <view v-else>
             <!-- 提示信息 -->
@@ -118,7 +115,6 @@
     import componentGoodsSpecChoice from '@/components/goods-spec-choice/goods-spec-choice';
     import componentGoodsBuy from '@/components/goods-buy/goods-buy';
     import componentBadge from '@/components/badge/badge';
-    import componentSharePopup from '@/components/share-popup/share-popup';
     let binding_static_url = app.globalData.get_static_url('binding', true);
 
     export default {
@@ -145,8 +141,7 @@
             componentBottomLine,
             componentGoodsSpecChoice,
             componentGoodsBuy,
-            componentBadge,
-            componentSharePopup,
+            componentBadge
         },
 
         onLoad(params) {
diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
index a54cb682..316d9b50 100644
--- a/pages/plugins/realstore/detail/detail.css
+++ b/pages/plugins/realstore/detail/detail.css
@@ -141,11 +141,28 @@ page {
 }
 
 /**
- * 客服弹窗
+ * 独立模式下底部操作导航
  */
-.header-service {
-    left: auto;
-    right: 24rpx;
+.button-list {
+    display: flex;
+    justify-content: space-between;
+}
+.button-list .item {
+    height: 70rpx;
+    padding: 0 40rpx;
+}
+.button-list .button-left {
+    display: flex;
+    width: 50%;
+    justify-content: space-evenly;
+}
+.button-list .button-right {
+    display: flex;
+    width: 50%;
+}
+.button-list .button-right button {
+    line-height: 70rpx;
+    padding: 0;
 }
 
 /**
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index a8799762..2d610a6f 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -7,25 +7,25 @@
                 <!-- 头部 -->
                 <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_mp_env ? 'top-search-width' : 'flex-1 flex-width'">
-                            <view :class="'va-m wh-auto top-nav-search '+(is_realstore_top_nav_back == 1 ? 'padding-left-main' : '')">
-                                <!-- #ifndef H5 -->
-                                <component-search
-                                    @onsearch="search_button_event"
-                                    @onicon="search_icon_event"
-                                    :propIsIconOnEvent="is_realstore_top_search_scan == 1"
-                                    :propIsOnEvent="true"
-                                    :propIsRequired="false"
-                                    :propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-dqxz'"
-                                    propPlaceholderClass="cr-grey-c"
-                                    propBgColor="#fff"
-                                    propIconColor="#333"
-                                    :propPlaceholder="$t('detail.detail.q42ger')"
-                                ></component-search>
-                                <!-- #endif -->
-                                <!-- #ifdef H5 -->
-                                <component-search @onsearch="search_button_event" :propIsRequired="false" propIconColor="#333" propPlaceholderClass="cr-grey-c" :propPlaceholder="$t('detail.detail.q42ger')" propBgColor="#fff"></component-search>
-                                <!-- #endif -->
+                        <template slot="right" :class="is_top_search_width ? 'top-search-width' : 'flex-1 flex-width'">
+                            <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>
+                                <block v-else>
+                                    <component-search
+                                        @onsearch="search_button_event"
+                                        @onicon="search_icon_event"
+                                        :propIsIconOnEvent="is_realstore_top_search_scan == 1"
+                                        :propIsOnEvent="true"
+                                        :propIsRequired="false"
+                                        :propIcon="is_realstore_top_search_scan == 1 ? 'icon-scan' : 'icon-qiandao-dqxz'"
+                                        propPlaceholderClass="cr-grey-c"
+                                        propBgColor="#fff"
+                                        propIconColor="#333"
+                                        :propPlaceholder="$t('detail.detail.q42ger')"
+                                    ></component-search>
+                                </block>
                             </view>
                         </template>
                         <template slot="content">
@@ -43,13 +43,13 @@
                                     <!-- 基础内容 -->
                                     <image :src="info.logo" mode="widthFix" class="logo border-radius-sm fl br" :data-value="info.logo" @tap="image_show_event"></image>
                                     <view class="base-right flex-1 flex-width">
-                                        <view v-if="(info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="use-type-icon pa text-size-xs cr-white bg-main" @tap="buy_use_type_event">
+                                        <view v-if="is_base_mode != 1 && (info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0" class="use-type-icon pa text-size-xs cr-white bg-main" @tap="buy_use_type_event">
                                             <text class="va-m margin-right-xs">{{ info.buy_use_type_list[buy_use_type_index]['name'] }}</text>
                                             <view class="dis-inline-block va-m pr top-sm">
                                                 <iconfont name="icon-arrow-bottom" size="28rpx" color="#fff"></iconfont>
                                             </view>
                                         </view>
-                                        <view :class="'title fw-b text-size single-text ' + ((info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0 ? 'title-length-limit' : '')">
+                                        <view :class="'title fw-b text-size single-text ' + (is_base_mode != 1 && (info.buy_use_type_list || null) != null && info.buy_use_type_list.length > 0 ? 'title-length-limit' : '')">
                                             <text v-if="(info.alias || null) != null" class="va-m title-icon border-radius-sm br-main cr-main text-size-xs padding-left-sm padding-right-sm margin-right-xs">{{ info.alias }}</text>
                                             <text class="va-m">{{ info.name }}</text>
                                         </view>
@@ -120,97 +120,127 @@
                         </view>
                     </view>
 
-                    <!-- 内容 -->
-                    <view class="content oh bg-white pr flex-row jc-sb" :style="content_style">
-                        <!-- 左侧 -->
-                        <scroll-view :scroll-y="true" class="left-content ht-auto bg-base">
-                            <view class="left-content-actual text-size-xs">
-                                <view :class="'item tc cr-base cp ' + (nav_active_index == -1 ? 'bg-white cr-main nav-left-border fw-b' : '')" :data-index="-1" :data-itemindex="-1" @tap="nav_event">{{$t('common.all')}}</view>
-                                <block v-if="(goods_category || null) != null && goods_category.length > 0">
-                                    <block v-for="(item, index) in goods_category" :key="index">
-                                        <view :class="'item tc cr-base pr cp ' + (nav_active_index == index ? 'bg-white cr-main nav-left-border fw-b' : '')" :data-index="index" :data-itemindex="-1" @tap="nav_event">
-                                            <text>{{ item.name }}</text>
-                                            <view v-if="(item.buy_number || 0) > 0" class="badge-icon pa">
-                                                <component-badge :propNumber="item.buy_number"></component-badge>
-                                            </view>
+                    <!-- 内容、是否基础模式则展示门店介绍 -->
+                    <view v-if="is_base_mode == 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">{{info.describe}}</scroll-view>
+                        <view v-if="(data_base.is_service_info || 0) == 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">
+                                    <!-- #ifndef MP-KUAISHOU -->
+                                    <view v-if="info.lat != 0 && info.lng != 0" propClass="item" @tap="address_map_event">
+                                        <view>
+                                            <iconfont name="icon-map-navigator" class="lh-sm" size="26rpx"></iconfont>
                                         </view>
-                                    </block>
-                                </block>
-                            </view>
-                        </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="goods-list-top-nav bg-white">
-                                    <!-- 排序 -->
-                                    <view class="nav-sort-content oh">
-                                        <block v-for="(item, index) in search_nav_sort_list" :key="index">
-                                            <view class="sort-item tc fl cp" :data-index="index" @tap="nav_sort_event">
-                                                <text class="cr-base va-m text-size-sm">{{item.name}}</text>
-                                                <image v-if="(item.icon || null) != null" class="sort-icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
-                                            </view>
-                                        </block>
+                                        <view class="cr-base text-size-md">{{$t('detail.detail.688i26')}}</view>
                                     </view>
-                                    <!-- 二级分类 -->
-                                    <view v-if="(goods_category || null) != null && goods_category.length > 0 && nav_active_index != -1 && (goods_category[nav_active_index]['items'] || null) != null && goods_category[nav_active_index]['items'].length > 0" class="word-list scroll-view-horizontal padding-horizontal-main padding-bottom-main">
-                                        <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'two-nav-item-' + nav_active_item_index">
-                                            <view :class="'word-icon dis-inline-block text-size-sm round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_index == -1 ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :data-index="nav_active_index" :data-itemindex="-1" @tap="nav_event">{{$t('common.all')}}</view>
-                                            <block v-for="(cv, ci) in goods_category[nav_active_index]['items']" :key="ci">
-                                                <view :class="'word-icon dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_index != -1 && nav_active_item_index == ci ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :id="'two-nav-item-' + ci" :data-index="nav_active_index" :data-itemindex="ci" @tap="nav_event">{{ cv.name }}</view>
-                                            </block>
-                                        </scroll-view>
+                                    <!-- #endif -->
+                                    <view class="item" @tap="share_event">
+                                        <view>
+                                            <iconfont name="icon-share-square" propClass="lh-sm" size="26rpx"></iconfont>
+                                        </view>
+                                        <view class="cr-base text-size-md">{{$t('common.share')}}</view>
                                     </view>
                                 </view>
-                                <!-- 右侧商品列表 -->
-                                <block v-if="(data_list || null) != null && data_list.length > 0">
-                                    <block v-for="(item, index) in data_list" :key="index">
-                                        <view :class="'goods-item bg-white padding-main border-radius-main oh spacing-mb '+((item.is_highlight || 0) == 1 ? 'item-highlight' : '')">
-                                            <view :data-index="index" :data-value="'/pages/goods-detail/goods-detail?id=' + item.id + '&is_opt_back=1&buy_use_type_index=' + buy_use_type_index + '&realstore_id=' + info.id" @tap="goods_event">
-                                                <view class="flex-row jc-sb">
-                                                    <image :src="item.images" mode="widthFix" class="goods-img radius fl br"></image>
-                                                    <view class="goods-base flex-1 flex-width padding-left-main flex-col jc-sb">
-                                                        <view class="goods-base-content">
-                                                            <view class="goods-title text-size-md multi-text fw-b">{{ item.title }}</view>
-                                                            <view v-if="(item.simple_desc || null) != null" class="simple-desc cr-grey-9 text-size-xs margin-top-xs single-text">{{ item.simple_desc }}</view>
-                                                        </view>
-                                                        <view class="margin-top oh flex-row jc-sb align-c">
-                                                            <view class="single-text sales-price va-b va-m">
-                                                                <text class="text-size-xss">{{ currency_symbol }}</text>
-                                                                <text class="text-size-lg">{{ item.min_price }}</text>
+                                <view class="button-right">
+                                    <button type="default" class="item br-main bg-main cr-white round text-size-md dis-block wh-auto" @tap="header_service_event">{{$t('cart.cart.31h34v')}}</button>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <block v-else>
+                        <!-- 左侧分类和右侧商品 -->
+                        <view class="content oh bg-white pr flex-row jc-sb" :style="content_style">
+                            <!-- 左侧 -->
+                            <scroll-view :scroll-y="true" class="left-content ht-auto bg-base">
+                                <view class="left-content-actual text-size-xs">
+                                    <view :class="'item tc cr-base cp ' + (nav_active_index == -1 ? 'bg-white cr-main nav-left-border fw-b' : '')" :data-index="-1" :data-itemindex="-1" @tap="nav_event">{{$t('common.all')}}</view>
+                                    <block v-if="(goods_category || null) != null && goods_category.length > 0">
+                                        <block v-for="(item, index) in goods_category" :key="index">
+                                            <view :class="'item tc cr-base pr cp ' + (nav_active_index == index ? 'bg-white cr-main nav-left-border fw-b' : '')" :data-index="index" :data-itemindex="-1" @tap="nav_event">
+                                                <text>{{ item.name }}</text>
+                                                <view v-if="(item.buy_number || 0) > 0" class="badge-icon pa">
+                                                    <component-badge :propNumber="item.buy_number"></component-badge>
+                                                </view>
+                                            </view>
+                                        </block>
+                                    </block>
+                                </view>
+                            </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="goods-list-top-nav bg-white">
+                                        <!-- 排序 -->
+                                        <view class="nav-sort-content oh">
+                                            <block v-for="(item, index) in search_nav_sort_list" :key="index">
+                                                <view class="sort-item tc fl cp" :data-index="index" @tap="nav_sort_event">
+                                                    <text class="cr-base va-m text-size-sm">{{item.name}}</text>
+                                                    <image v-if="(item.icon || null) != null" class="sort-icon va-m" :src="common_static_url + 'sort-' + item.icon + '-icon.png'" mode="aspectFill"></image>
+                                                </view>
+                                            </block>
+                                        </view>
+                                        <!-- 二级分类 -->
+                                        <view v-if="(goods_category || null) != null && goods_category.length > 0 && nav_active_index != -1 && (goods_category[nav_active_index]['items'] || null) != null && goods_category[nav_active_index]['items'].length > 0" class="word-list scroll-view-horizontal padding-horizontal-main padding-bottom-main">
+                                            <scroll-view :scroll-x="true" :scroll-with-animation="true" :scroll-into-view="'two-nav-item-' + nav_active_item_index">
+                                                <view :class="'word-icon dis-inline-block text-size-sm round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_index == -1 ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :data-index="nav_active_index" :data-itemindex="-1" @tap="nav_event">{{$t('common.all')}}</view>
+                                                <block v-for="(cv, ci) in goods_category[nav_active_index]['items']" :key="ci">
+                                                    <view :class="'word-icon dis-inline-block text-size-xs round padding-top-xs padding-bottom-xs padding-left padding-right ' + (nav_active_item_index != -1 && nav_active_item_index == ci ? 'bg-main-light br-main-light cr-main' : 'br-grey cr-grey')" :id="'two-nav-item-' + ci" :data-index="nav_active_index" :data-itemindex="ci" @tap="nav_event">{{ cv.name }}</view>
+                                                </block>
+                                            </scroll-view>
+                                        </view>
+                                    </view>
+                                    <!-- 右侧商品列表 -->
+                                    <block v-if="(data_list || null) != null && data_list.length > 0">
+                                        <block v-for="(item, index) in data_list" :key="index">
+                                            <view :class="'goods-item bg-white padding-main border-radius-main oh spacing-mb '+((item.is_highlight || 0) == 1 ? 'item-highlight' : '')">
+                                                <view :data-index="index" :data-value="'/pages/goods-detail/goods-detail?id=' + item.id + '&is_opt_back=1&buy_use_type_index=' + buy_use_type_index + '&realstore_id=' + info.id" @tap="goods_event">
+                                                    <view class="flex-row jc-sb">
+                                                        <image :src="item.images" mode="widthFix" class="goods-img radius fl br"></image>
+                                                        <view class="goods-base flex-1 flex-width padding-left-main flex-col jc-sb">
+                                                            <view class="goods-base-content">
+                                                                <view class="goods-title text-size-md multi-text fw-b">{{ item.title }}</view>
+                                                                <view v-if="(item.simple_desc || null) != null" class="simple-desc cr-grey-9 text-size-xs margin-top-xs single-text">{{ item.simple_desc }}</view>
                                                             </view>
-                                                            <view class="tc flex-row align-c">
-                                                                <block v-if="(item.is_error || 0) == 0">
-                                                                    <view v-if="(item.buy_number || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="buy_number_event">
-                                                                        <iconfont name="icon-cart-dec" size="40rpx" :color="theme_color"></iconfont>
-                                                                    </view>
-                                                                    <view v-if="(item.buy_number || 0) > 0" class="buy-number cr-black text-size-sm padding-left-xs padding-right-xs">
-                                                                        {{ item.buy_number }}
-                                                                    </view>
-                                                                    <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="buy_number_event">
-                                                                        <iconfont name="icon-cart-inc" size="40rpx" :color="theme_color"></iconfont>
-                                                                    </view>
-                                                                </block>
-                                                                <block v-else>
-                                                                    <text class="cr-grey-c text-size-xs">{{ item.is_error_msg }}</text>
-                                                                </block>
+                                                            <view class="margin-top oh flex-row jc-sb align-c">
+                                                                <view class="single-text sales-price va-b va-m">
+                                                                    <text class="text-size-xss">{{ currency_symbol }}</text>
+                                                                    <text class="text-size-lg">{{ item.min_price }}</text>
+                                                                </view>
+                                                                <view class="tc flex-row align-c">
+                                                                    <block v-if="(item.is_error || 0) == 0">
+                                                                        <view v-if="(item.buy_number || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="buy_number_event">
+                                                                            <iconfont name="icon-cart-dec" size="40rpx" :color="theme_color"></iconfont>
+                                                                        </view>
+                                                                        <view v-if="(item.buy_number || 0) > 0" class="buy-number cr-black text-size-sm padding-left-xs padding-right-xs">
+                                                                            {{ item.buy_number }}
+                                                                        </view>
+                                                                        <view class="cp pr top-sm" :data-index="index" data-type="1" @tap.stop="buy_number_event">
+                                                                            <iconfont name="icon-cart-inc" size="40rpx" :color="theme_color"></iconfont>
+                                                                        </view>
+                                                                    </block>
+                                                                    <block v-else>
+                                                                        <text class="cr-grey-c text-size-xs">{{ item.is_error_msg }}</text>
+                                                                    </block>
+                                                                </view>
                                                             </view>
                                                         </view>
                                                     </view>
                                                 </view>
                                             </view>
-                                        </view>
+                                        </block>
                                     </block>
-                                </block>
-                                <block v-else>
-                                    <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" :propBackBtn="false"></component-no-data>
-                                </block>
-                            </view>
-                        </scroll-view>
-                    </view>
+                                    <block v-else>
+                                        <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg" :propBackBtn="false"></component-no-data>
+                                    </block>
+                                </view>
+                            </scroll-view>
+                        </view>
 
-                    <!-- 商品购买 -->
-                    <component-goods-buy ref="goods_buy" :propCurrencySymbol="currency_symbol" v-on:CartSuccessEvent="goods_spec_cart_back_event"></component-goods-buy>
+                        <!-- 商品购买 -->
+                        <component-goods-buy ref="goods_buy" :propCurrencySymbol="currency_symbol" v-on:CartSuccessEvent="goods_spec_cart_back_event"></component-goods-buy>
+                    </block>
                 </view>
             </block>
             <block v-else>
@@ -220,7 +250,12 @@
         </view>
 
         <!-- 门店购物车 -->
-        <component-realstore-cart ref="realstore_cart" :propCurrencySymbol="currency_symbol" :propStatus="is_cart_nav" v-on:CartSuccessEvent="goods_opt_cart_back_event" v-on:BuyTypeSwitchEvent="buy_type_switch_event" v-on:CartDataBackEvent="cart_data_back_event"></component-realstore-cart>
+        <block v-if="is_base_mode != 1">
+            <component-realstore-cart ref="realstore_cart" :propCurrencySymbol="currency_symbol" :propStatus="is_cart_nav" v-on:CartSuccessEvent="goods_opt_cart_back_event" v-on:BuyTypeSwitchEvent="buy_type_switch_event" v-on:CartDataBackEvent="cart_data_back_event"></component-realstore-cart>
+        </block>
+
+        <!-- 分享弹窗 -->
+        <component-share-popup ref="share"></component-share-popup>
     </view>
 </template>
 <script>
@@ -232,6 +267,7 @@
     import componentBadge from '@/components/badge/badge';
     import componentPopup from '@/components/popup/popup';
     import componentRealstoreCart from '@/components/realstore-cart/realstore-cart';
+    import componentSharePopup from '@/components/share-popup/share-popup';
 
     var common_static_url = app.globalData.get_static_url('common');
     var status_bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0, true));
@@ -242,15 +278,17 @@
                 theme_color: app.globalData.get_theme_color(),
                 status_bar_height: status_bar_height,
                 common_static_url: common_static_url,
-                is_mp_env: false,
-                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
-                is_mp_env: true,
+                client_type: app.globalData.application_client_type(),
+                currency_symbol: app.globalData.currency_symbol(),
+                is_top_search_width: false,
+                // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+                is_top_search_width: true,
                 // #endif
                 content_style: '',
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
                 data_is_loading: 0,
-                currency_symbol: app.globalData.currency_symbol(),
+                is_base_mode: 0,
                 is_cart_nav: false,
                 buy_use_type_index: 0,
                 params: null,
@@ -332,7 +370,8 @@
             componentSearch,
             componentBadge,
             componentPopup,
-            componentRealstoreCart
+            componentRealstoreCart,
+            componentSharePopup
         },
         props: {},
 
@@ -404,21 +443,30 @@
                         if (res.data.code == 0) {
                             // 门店数据
                             var data = res.data.data;
+                            // 基础配置
+                            var data_base = data.base || {};
+                            // 是否基础模式
+                            var is_base_mode = parseInt(data.is_base_mode || 0);
                             // 桌码
                             var tablecode = data.tablecode || null;
-                            // 内容其他高度
-                            var content_other_height = '364rpx';
-                            // #ifdef H5
-                            content_other_height = '376rpx';
-                            // #endif
+                            // 开启门店基础
+                            var base_mode_style = '0rpx';
+                            if(is_base_mode == 1) {
+                                // 开启了联系客服有底部按钮、则仅内容高度
+                                base_mode_style = ((data_base.is_service_info || 0) == 1) ? '240rpx' : '90rpx';
+                            }
+                            // 内容高度
+                            var content_style = 'height: calc(100vh - '+(this.client_type == 'h5' ? '376rpx' : '364rpx')+' - '+this.status_bar_height+'px - '+(tablecode == null ? '0rpx' : '44rpx')+ ' - '+base_mode_style+');';
+
                             this.setData({
+                                is_base_mode: is_base_mode,
                                 is_cart_nav: true,
-                                data_base: data.base || null,
+                                data_base: data_base,
                                 info: data.info || null,
                                 goods_category: data.goods_category || [],
                                 favor_user: data.favor_user || [],
                                 tablecode: tablecode,
-                                content_style: 'height: calc(100vh - '+content_other_height+' - '+this.status_bar_height+'px - '+(tablecode == null ? '0rpx' : '44rpx')+');',
+                                content_style: content_style,
                             });
 
                             // 收藏处理
@@ -451,8 +499,11 @@
                                     },
                                 });
 
-                                // 获取购物车数据
-                                this.get_cart_data();
+                                // 是否基础模式
+                                if(this.is_base_mode != 1) {
+                                    // 获取购物车数据
+                                    this.get_cart_data();
+                                }
 
                                 // 下单类型索引
                                 this.setData({
@@ -461,7 +512,11 @@
 
                                 // 获取数据、仅首次调用，获取列表接口
                                 if (this.is_first == 1) {
-                                    this.get_data_list();
+                                    // 是否基础模式
+                                    if(this.is_base_mode != 1) {
+                                        this.get_data_list();
+                                    }
+                                    // 非首次记录
                                     this.setData({
                                         is_first: 0,
                                     });
@@ -772,7 +827,7 @@
 
             // 电话
             tel_event(e) {
-                app.globalData.call_tel(this.info.service_tel || null);
+                app.globalData.call_tel(e);
             },
 
             // 图片预览
@@ -901,7 +956,16 @@
                 this.setData({
                     header_service_status: !this.header_service_status,
                 });
-            }
+            },
+
+            // 分享开启弹层
+            share_event(e) {
+                if ((this.$refs.share || null) != null) {
+                    this.$refs.share.init({
+                        share_info: this.share_info
+                    });
+                }
+            },
         },
     };
 </script>
diff --git a/pages/plugins/shop/design/design.vue b/pages/plugins/shop/design/design.vue
index 65f1deaf..6b88b124 100644
--- a/pages/plugins/shop/design/design.vue
+++ b/pages/plugins/shop/design/design.vue
@@ -382,7 +382,7 @@
 
             // 电话
             tel_event(e) {
-                app.globalData.call_tel(e.currentTarget.dataset.value || null);
+                app.globalData.call_tel(e);
             },
 
             // 图片预览
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index a47f630f..277964c3 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -458,7 +458,7 @@
 
             // 电话
             tel_event(e) {
-                app.globalData.call_tel(e.currentTarget.dataset.value || null);
+                app.globalData.call_tel(e);
             },
 
             // 图片预览
diff --git a/pages/plugins/signin/detail/detail.vue b/pages/plugins/signin/detail/detail.vue
index 592caad6..9f10882f 100644
--- a/pages/plugins/signin/detail/detail.vue
+++ b/pages/plugins/signin/detail/detail.vue
@@ -7,14 +7,14 @@
                 <view class="signin-opration-group pa flex-col cr-white">
                     <view v-if="(data_base.is_share || 0) == 1" class="share oh flex-row"  @tap="share_event">
                         <view class="content">
-                            <iconfont name="icon-qiandao-fenxiang" propClass="pr top-xs" size="32rpx"></iconfont>
-                            <text>{{$t('common.share')}}</text>
+                            <iconfont name="icon-share-square" propClass="pr top-xs" size="32rpx"></iconfont>
+                            <text>{{$t('common.share')}}</text>
                         </view>
                     </view>
                     <view v-if="(data_base.is_team || 0) == 1 && (user || null) != null && data.user_id != user.id" class="team oh flex-row" @tap="team_event">
                         <view class="content">
-                            <iconfont name="icon-qiandao-zudui" propClass="pr top-xs" size="34rpx"></iconfont>
-                            <text>{{$t('detail.detail.8ua11k')}}</text>
+                            <iconfont name="icon-qiandao-zudui" propClass="pr top-xs" size="34rpx"></iconfont>
+                            <text>{{$t('detail.detail.8ua11k')}}</text>
                         </view>
                     </view>
                 </view>
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 21de2e89..6b2bb44d 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -14,6 +14,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-map-navigator:before {
+  content: "\10183";
+}
+
 .icon-down-mark:before {
   content: "\e729";
 }
@@ -250,7 +254,7 @@
   content: "\e6bc";
 }
 
-.icon-qiandao-fenxiang:before {
+.icon-share-square:before {
   content: "\e6bd";
 }
 
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
index 15890523aaa75035f7280dc93ca8b91950161550..1a42135260f291000a022089d33ad18ce59360a8 100644
GIT binary patch
delta 1893
zcmXxlYiyHc6bJDC^Y*rOZP(kj?pAgcL750L5T;CpF>&H#fIxy$*v3q@F#*jW#uEKt
zOh^<+44(yc5|!x?MJJ-@L_tLGf{Ka*Pp1w<#V>}m{@<Or<k$Doc6*<5{^wc$J~K36
zo~cZ&`35lC0IXiyo$Rfz*}NNYv;gjobzPe~yq4Ps__~0`SZ8~(ZPJY3Yy9jvs_Wzp
z?`+o$o)1xVXZNPQj*;vY{=PA4>sr4ynSCm98SuWv_xE=v`+7|e-s5|5UYGYIyW2x0
zyXyylmaTxbu6O;$O_!U7=L3sJ0axqxp{ltnVE9=&Z`M5dKwkYn$aV4tFtVz>_5Wiw
zlTEo+IiBWq4lMgFf9&tA*qJZ`RyMoyr0LsXIR~4p%_g-J%W)r;p%qJTFBao&EW$l#
z!Ch#^0yN=HEJP#bV;=6n?Wo5sxD|8Jz_Z&h2RCCjCSew4q7Kt>6J}r<sxTEd;s#ug
zDX7I{T!(8h5!av^HK;@dCZHT;NT3uYD4vQU#1TV23Q&kBA_yUj0D{PapU>}w54mu`
z4G)}fz#8mz2284cd{JByAkQf*<&o{OaZQjtimQV>ueeUg3yLd-yr{T#NWWqgATKG_
z1M;$BWgxGp6pI9TRk2)<eTs#HFcUVG5c0ZWF(HGBWrgflEHLB^#Zp5KC>9;^regUa
z%#4kVfE+~1egS&|d0VkNkaraO1Yrnm>=Wc&#oj><DRvRU@Y&c;$YI6KLf%*7-~E8+
z#BM{5D9lOm<U_>>Kt56o17uh+7Lbn>0|Gg!7!}ATilKpgsu&;0F~uN3jw?nA@|j||
zASWor7v>D|xnklVCl#{?`9d*;kW-3zgq&7PCge-Sj6%LrOe^GT#oR);9oU#)$Qi{f
zBPHMRf*5PacZvare6JXF$XUhELw-<<KjcTnL4f?EI1-R^io*f<S#eAtBZ>n9IX{l|
zFX71rg<>9mQ5+|TC=M1RtvF(kQN>|{{Hi#1klz#s5c0d?C_=^*hZ1s8aXcZH?EYWk
z>cc$#p*XXU%Zk$r`BQO@A%81QG}8PdHqJKEd_Wtg9BDqdjq{E)7i8n)Bh7`{xCbE3
z3fPcx^MqxxabrN5WwLRLK$>N>akD_0A+&KDH0FtMx)t&k)4c}6X0quse_0LI6~``T
zrSnneRo7NG+`XPY&#s(E&g`6{Iaj@1-o3sq->KY|+&zB3e~W)C6^IAs1-1qL4R!_3
z<}J({3oQyK!n?v3!kI`%<WMvoZHo3suf&>T&&JN>=j1QU-&;^u&{uGva9Uwo;c$FO
z{A5wQsG(>_(S_nfabxk8;*pZAC1*-!mF_4#P*z#CylfybIdObKqC8&ySovthiOS|G
zpS_^$LC27z0jU`K&qBDWYRyDPO|4Zo)6^v_j|m#%N|?f^*I3PtNSUiGvp-T`#X=5$
zs3PuhXO6kcGSkh>V7~KyQ=OT=z!XHxlGU!#>Ioh*%j1bxgsxr;#jMy$XDpaGY>j5-
z+Lbc)i{pspwv$s+Ik9%I#}{ofD|SA<cpz+6BEbKZQ+kq*Jh(2oY5j)5>8+=&fPZ6W
Sazp!+jSoG{!(idE?dCslT;bmU

delta 1757
zcmXBUX>3$w6vpxYolf_?otEyD0<wuztq52Fu`D780@g}uWMnHzTQFi$_%e}?1S44E
z2g3&gh&7^As)&k+fGdb7id$8zdd3B-Mj?h6@VT5xe)qk1?zFk@InTKVdxM_6!PdIO
z+yH_tz_R5X@pY3P+3*mg%!9P0tJ^oM+O(#<4YFEc=JvLg@fBlY7jpI6vof(wUt~^6
zZP58a8PV3UzU%&h%m3*Aos(tlYnR6}cATFGnLWC{uOr^IF6iJ*-7C{|ZD+h=WkKc6
z#$H(PFGN<aTl?Vp2~W-%3X7IO>g;U?hfixk&ll=EIeFZD`Hknvj_L~-n14@r=gNBd
z(&a?zy(y3CGJ{C?tv=!1mhPIMH<BFFeJbecn-|#-B$jYD&D_Nz7PF8$na6zYU;%Tv
zomtFg4!1FrCT?X0w{R1U+{{#_>1;Yvn8aj8b0ZVEf$O-Q2Ck)!3Dk29<G7mfjA1OJ
zxQdYsX9UBjrG}wYQB5Tkls8bu5Q>RWLMcTQl1~9S<dR1=>3aN3vWSvO8Y$X}HW8$C
zKODW-y)~Md$O-oqtq+g-w1Dk!EYZ5tX@l4<r>$a7J8c@<?X-RD8K**EYEVce!Jc(0
z4z|asOxW{@@Sq>f*ZP7}?XbO0Rm5I&swcM3sj^s~Q;o5goT`nz>{NGbzf%XWSDbo*
z9dIO?bn>cGgRs|}T7|vt)HF<S45?|@8%~YH4mq_HQw&3DE_T?d&DdM+%HJN*xiDSp
zQAmUbr2sqTln3l>r(|I7IAsKT*C{R7drrB*-gin6_JLEDu;Wgt!cI8l3;WP1X$kD4
zE<~ZjK5~j5cFHM;*vC$h#6EEfCwAH?rr4)WfyF*^iY|7>Da6?4PI1P*2&w-{Huj}c
z#<8!Q(vE%YlzXh-X#%is9JN}%b(#w7JE!@;&N@vB_Px{0U;|FmgC%~@K{QC%kB)M!
zKRL}7W=>OvC7tFC``KyouwR^J5c}0>8nNG;<`O&SG@;n<E}>z?2A#$h`@?B~u|J(g
z8T-p=sIkAD#+#%bDx^UtsfP_|<Vk81Aq_uCZ7!tO07>mSq!$9oD)nCny%=?&(uDMu
zAgNM@^u8deQij5pU{d`IU3n2|QR_A{7&Hd^Bhko#l-3lBPLCc=ZAv|s){x$q-kN?U
z{Zhu3jKi7rnVnhnSx;ogvfHvx<xI`#&FRn0$X%FwD3Mp6_f&pfes4ih!9ZbaVNc<a
zqOnDriu#Llirb41#0p|dW4mG}O7coNOD>i+mToM)Fl6+Q&1Gd}kC*kAN6VYbd&&nY
zvMQ!l?5=F8++O)#RddzGDyy!lUSB;}v$bYmXn*aD+C9S_t1GArLmq@ropLmi7B*^R
u-Kf6vS+O}mOLx}d-hjU2i%&-i3m#Y#?_3dIJAT#5&Muv<?t89zTkt>5)Wn$p