From 71f1c854926ce6de5bcff119af5789a95ee0bf98 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 11 Oct 2023 09:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=90=E8=B4=B9?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9A=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=B6=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=AC=AC=E4=B8=80=E4=B8=AA=E8=AE=A1=E9=87=8F?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Services/TotalServices/ShippingService.php         | 2 +-
 .../beike/admin/views/pages/products/form/form.blade.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/beike/Shop/Services/TotalServices/ShippingService.php b/beike/Shop/Services/TotalServices/ShippingService.php
index 90a5bf77..1dfd6ba9 100644
--- a/beike/Shop/Services/TotalServices/ShippingService.php
+++ b/beike/Shop/Services/TotalServices/ShippingService.php
@@ -203,7 +203,7 @@ class ShippingService{
             $amount += (float)sprintf("%.2f",$firstWeightFee);
             // 判断：如果总重量超过首重  则计算续重运费
             $surplus = (float)$sumWeight - $firstWeight;
-            if($surplus > 0) $amount += (float)sprintf("%.2f",($surplus / $addWeight) * $continuationWeightFee);
+            if($surplus > 0) $amount += (float)sprintf("%.2f",(ceil($surplus / $addWeight)) * $continuationWeightFee);
         }
 
         return $amount;
diff --git a/resources/beike/admin/views/pages/products/form/form.blade.php b/resources/beike/admin/views/pages/products/form/form.blade.php
index d56d0d33..22708fee 100644
--- a/resources/beike/admin/views/pages/products/form/form.blade.php
+++ b/resources/beike/admin/views/pages/products/form/form.blade.php
@@ -179,7 +179,7 @@
                 <x-admin::form.row :title="__('product.unit_of_measurement')" required>
                   <select class="form-select me-3" name="unit" v-model="form.unit">
                     @foreach ($unit_list as $option)
-                      <option value="{{ $option['title'] }}" {{ $option['title'] == $product->unit ? 'selected': '' }}>{{ $option['title'] }}</option>
+                      <option value="{{ $option['title'] }}" {{ $option['title'] == old('unit', $product->unit ?? '') ? 'selected': '' }}>{{ $option['title'] }}</option>
                     @endforeach
                   </select>
                 </x-admin::form.row>
@@ -871,7 +871,7 @@
           minimum_order: {{$product->minimum_order ?? 0}},
           sales_method: '{{$product->sales_method ?? 'piece'}}',
           piece_to_batch: {{$product->piece_to_batch ?? 1}},
-          unit: '{{$product->unit ?? ''}}',
+          unit: '{{ $product->unit ?  : 'Acre/Acres' }}',
         },
 
         variablesBatch: {