From 16765b9898d0cdebecc82de4ca91c4b2d5ceb440 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 31 Oct 2023 23:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/plugins.css                       | 10 +++++++---
 components/realstore-list/realstore-list.vue | 10 ++++------
 pages/goods-detail/goods-detail.css          | 20 ++++++++++----------
 pages/goods-detail/goods-detail.vue          |  6 +++---
 pages/plugins/realstore/detail/detail.vue    |  2 +-
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/common/css/plugins.css b/common/css/plugins.css
index 167a4e8d..5157c9ff 100644
--- a/common/css/plugins.css
+++ b/common/css/plugins.css
@@ -225,15 +225,19 @@
 
 .plugins-blog-grid-list .item .blog-img {
     width: 100%;
-    /* height: 230rpx !important; */
 }
 
 /**
 * 门店 - 数据列表
 */
 .plugins-realstore-data-list .item .address-content {
-    width: calc(100% - 60rpx);
-}
+    width: calc(100% - 150rpx);
+}
+
+.plugins-realstore-data-list .item .address-distance {
+    right: 20rpx;
+    bottom: 42rpx;
+}
 
 .plugins-realstore-data-list .item .icon-list {
     right: 24rpx;
diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue
index ec7b07de..75e8fd3e 100644
--- a/components/realstore-list/realstore-list.vue
+++ b/components/realstore-list/realstore-list.vue
@@ -24,15 +24,13 @@
                     </view>
                     <view class="flex-row jc-sb align-c br-t-dashed margin-top-main padding-top-sm">
                         <!-- 地址 -->
-                        <view class="oh cp padding-top-xs">
-                            <view class="dis-inline-block va-m cr-grey-9 pr top-sm">
+                        <view class="padding-top-xs address-content single-text cr-base margin-left-xs dis-inline-block text-size-xs oh cp" :data-value="item.province_name + item.city_name + item.county_name + item.address" @tap.stop="text_copy_event">
+                            <view class="dis-inline-block va-m cr-grey-9 margin-top-sm">
                                 <iconfont name="icon-mendian-dingwei"></iconfont>
                             </view>
-                            <view class="address-content single-text cr-base margin-left-xs dis-inline-block text-size-xs va-m" :data-value="item.province_name + item.city_name + item.county_name + item.address" @tap.stop="text_copy_event">
-                                {{ item.province_name }}{{ item.city_name }}{{ item.county_name }}{{ item.address }}
-                            </view>
+                            <text class="va-m margin-left-xs">{{ item.province_name }}{{ item.city_name }}{{ item.county_name }}{{ item.address }}</text>
                         </view>
-                        <view v-if="(item.distance || null) != null" class="text-size-xs cr-grey-c padding-top-xs">距您{{ item.distance }}</view>
+                        <view v-if="(item.distance || null) != null" class="text-size-xs cr-grey-c pa address-distance">距您{{ item.distance }}</view>
                     </view>
                     <!-- 右侧操作 -->
                     <view class="icon-list pa">
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index 1cc3f5b5..4d1a7951 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -225,23 +225,22 @@
     overflow: hidden;
 }
 .price-content {
-    width: 60%;
-    float: left;
+    width: calc(100% - 220rpx);
 }
-.countdown-content {
-    width: 40%;
+.goods-base-right-opt {
+    width: 206rpx;
 }
 .price-content,
-.countdown-content {
+.goods-base-right-opt {
     box-sizing: border-box;
     position: relative;
     height: 100%;
 }
-.countdown-content image {
+.goods-base-right-opt image {
     width: 40rpx;
     height: 40rpx;
 }
-.countdown-content .collect {
+.goods-base-right-opt .collect {
     width: 76rpx;
 }
 .price-content .price-icon {
@@ -266,10 +265,14 @@
 /**
  * 价格信息与秒杀结合
  */
+.goods-base-price-countdown {
+    background: #e84742 !important;
+}
 .goods-base-price-countdown .price-content {
     background: #f9534e;
     background-repeat: no-repeat;
     background-size: 100% 100%;
+    width: 60%;
 }
 .goods-base-price-countdown .price-icon { 
     margin-right: 0;
@@ -287,9 +290,6 @@
 .goods-base-price-countdown .original-price {
     color: #ffcece;
 }
-.goods-base-price-countdown .countdown-content {
-    background: #e84742;
-}
 .countdown-content .time-title {
     font-size: 38rpx;
     margin-bottom: 10rpx;
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 4b235a38..7d3b9a33 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -89,7 +89,7 @@
             <!-- 价格信息 -->
             <view :class="'goods-base-price bg-white oh spacing-mb ' + ((plugins_seckill_data || null) != null ? 'goods-base-price-countdown' : '')">
                 <!-- 价格 -->
-                <view class="price-content padding-lg" :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 ? '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>
@@ -112,14 +112,14 @@
                         propDsColor="#fff"
                     ></component-countdown>
                 </view>
-                <view v-else class="flex-row jc-e align-c countdown-content padding-top-lg padding-bottom-lg padding-left-xs padding-right-xs">
+                <view v-else class="flex-row jc-e align-c goods-base-right-opt padding-top-lg padding-bottom-lg padding-left-xs padding-right-xs fr">
                     <!-- 分享 -->
                     <view class="goods-share tc cp margin-right-lg" @tap="popup_share_event">
                         <image :src="common_static_url + 'share-icon.png'" mode="scaleToFill" class="dis-block auto"></image>
                         <view class="cr-grey text-size-xs">分享</view>
                     </view>
                     <!-- 收藏 -->
-                    <view class="collect tc cp margin-horizontal-main" @tap="goods_favor_event">
+                    <view class="collect tc cp margin-left-main" @tap="goods_favor_event">
                         <image :src="common_static_url + 'favor' + (nav_favor_button_info.status == 1 ? '-active' : '') + '-icon.png'" mode="scaleToFill" class="dis-block auto"></image>
                         <view :class="'cr-grey text-size-xs ' + (nav_favor_button_info.status == 1 ? 'cr-main' : 'cr-grey')">{{ nav_favor_button_info.text }}</view>
                     </view>
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index 83aca80f..7e8f689b 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -53,7 +53,7 @@
                                 </view>
                                 <view class="margin-top-xs text-size-xs cr-grey">
                                     <view v-if="(info.status_info.time || null) != null">营业时间：{{ info.status_info.time }}</view>
-                                    <view v-if="(info.distance || null) != null">距离您{{ info.distance }}</view>
+                                    <view v-if="(info.distance || null) != null">距您{{ info.distance }}</view>
                                 </view>
                             </view>
                         </view>