From 39cd329a472635e496c53a07176747eae01d55e4 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 31 Aug 2023 14:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E8=BF=90=E8=B4=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/default/product/product.blade.php | 51 ++++++++++++++----------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php
index dcf35820..89b629cc 100644
--- a/themes/default/product/product.blade.php
+++ b/themes/default/product/product.blade.php
@@ -107,8 +107,8 @@
 
 
     .logistics-content{
-      width: 80px;
-      margin-left: 20px;
+     /* width: 80px;
+      margin-left: 20px;*/
       cursor: pointer;
       -webkit-user-select: none; /* Safari */
       -moz-user-select: none; /* Firefox */
@@ -120,7 +120,7 @@
     }
 
     .other-amount-format{
-      margin-right: 100px;
+      /*margin-right: 100px;*/
     }
   </style>
   <div class="container {{ request('iframe') ? 'pt-4' : '' }}" id="product-app" v-cloak>
@@ -374,26 +374,35 @@
             <li v-for="(item,index) in totals">
               <template v-if="item.code == 'shipping'">
                 {{--当内容为运费时--}}
-                <span class="shipping-line">
-                  <div>@{{ item.title }}</div>
-                  <div class="country" v-if="Object.keys(item.country).length > 0">
-                    {{ __('shop/products.ship_to') }}：
-                    <div class="wh-20 border d-flex justify-content-center rounded-2 align-items-center">
-                      <img :src="item.country.icon" class="img-fluid rounded-2">
-                    </div>
-                    <div class="country-name" @click="$refs['select-countries'].showSelectCountries()">
-                      @{{ item.country.name }}<i class="bi bi-chevron-down"></i>
-                      @{{ logisticsChangeCountry(item.country.id) }}
+                <div style="width: 100%;display: inline-flex;flex-direction: column;flex-wrap: nowrap;justify-content: center;align-items: flex-start;">
+                  <div style="height: 20px !important;width: 100%;display: inline-flex;justify-content: space-between;">
+                    <span class="shipping-line">
+                      <div>@{{ item.title }}</div>
+                      <div class="country" v-if="Object.keys(item.country).length > 0">
+                        {{ __('shop/products.ship_to') }}：
+                        <div class="wh-20 border d-flex justify-content-center rounded-2 align-items-center">
+                          <img :src="item.country.icon" class="img-fluid rounded-2">
+                        </div>
+                        <div class="country-name" @click="$refs['select-countries'].showSelectCountries()">
+                          @{{ item.country.name }}<i class="bi bi-chevron-down"></i>
+                          @{{ logisticsChangeCountry(item.country.id) }}
+                        </div>
+                      </div>
+                  </span>
+                      <span class="shipping-line" v-if="item.show_tips != 1" @click="$refs['select-logistics'].showSelectLogistics()">
+                      <div>@{{ item.amount_format }}</div>
+                      {{--<div class="logistics-content" v-if="Object.keys(item.logistics).length > 0">
+                        @{{ item.logistics.name }}<i class="bi bi-chevron-down"></i>
+                      </div>--}}
+                    </span>
+                    <span class="shipping-line" v-else>@{{ item.amount_tips }}</span>
+                  </div>
+                  <div style="height: 20px!important;margin-top: 10px;width: 100%;display: inline-flex;justify-content: flex-end;">
+                    <div class="logistics-content" v-if="Object.keys(item.logistics).length > 0">
+                      @{{ item.logistics.name }}<i class="bi bi-chevron-down"></i>
                     </div>
                   </div>
-                </span>
-                <span class="shipping-line" v-if="item.show_tips != 1" @click="$refs['select-logistics'].showSelectLogistics()">
-                  <div>@{{ item.amount_format }}</div>
-                  <div class="logistics-content" v-if="Object.keys(item.logistics).length > 0">
-                    @{{ item.logistics.name }}<i class="bi bi-chevron-down"></i>
-                  </div>
-                </span>
-                <span class="shipping-line" v-else>@{{ item.amount_tips }}</span>
+                </div>
               </template>
               <template v-else>
                 <span>@{{ item.title }}</span>