From 84d6777d0f2d711e2745fb35d4e17c7b23e9689b Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 22 Sep 2023 17:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E8=B5=B7=E8=AE=A2=E9=87=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BB=B7=E6=A0=BC=20=E6=97=B6=E8=B5=B7?=
 =?UTF-8?q?=E8=AE=A2=E9=87=8F=E4=B8=80=E7=9B=B4=E6=98=BE=E7=A4=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/default/product/product.blade.php |  4 ++--
 themes/default/shared/product.blade.php  | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php
index cf0e43f0..e48ef3fd 100644
--- a/themes/default/product/product.blade.php
+++ b/themes/default/product/product.blade.php
@@ -168,7 +168,7 @@
           @endhookwrapper
           @hookwrapper('product.detail.price')
           <div class="price-wrap d-flex align-items-end" v-if="price_setting === 'sku'">
-            <div class="new-price fs-1 lh-1 fw-bold me-2">@{{ product.trade_term || 'DAP' }}：</div>
+            <div class="new-price fs-1 lh-1 fw-bold me-2">{{$product['trade_term'] ?? 'DAP'}}：</div>
             <div class="new-price fs-1 lh-1 fw-bold me-2">@{{ product.price_format }}</div>
             <div class="new-price fs-1 lh-1 fw-bold me-2">-</div>
             <div class="old-price fs-1 lh-1 fw-bold me-2" v-if="product.price != product.origin_price && product.origin_price !== 0">@{{ product.origin_price_format }}</div>
@@ -184,7 +184,7 @@
             </div>
           </div>
           <div class="price-wrap d-flex align-items-end" v-if="price_setting === 'num'" style="border-top: 1px solid #aaaaaa;border-bottom: 1px solid #aaaaaa;padding: 10px;">
-            <div class="item" style="color: #1a9bff;font-size: 18px;height: 54px;line-height: 54px;">@{{ product.trade_term || 'DAP' }}：</div>
+            <div class="item" style="color: #1a9bff;font-size: 18px;height: 54px;line-height: 54px;">{{$product['trade_term'] ?? 'DAP'}}：</div>
             <div class="item" v-for="(item,index) in numPrices" style="flex: 1">
               <div class="num" v-if="index < numPrices.length - 1" style="
                   white-space: nowrap;
diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php
index 3cd7b041..bb7eabe2 100644
--- a/themes/default/shared/product.blade.php
+++ b/themes/default/shared/product.blade.php
@@ -67,20 +67,16 @@
           <span class="price-new">{{ $product['price_format'] }}</span>
       @endif
 
-        @if(!empty($product['unit_format']))
+        {{--@if(!empty($product['unit_format']))
           <span style="color:#aaa">/{{ $product['unit_format'] }}</span>
-        @endif
+        @endif--}}
     </div>
     <!--yt修改-->
 
-    @if ((int)$product['minimum_order'] > 0 || ($product['numprices'] != [] ? $product['numprices'][0]['num'] : 0) > 0)
+    @if ((int)$product['minimum_order'] > 0)
       <div class="product-price">
-        @if ($product['price_setting'] === 'num')
-          <span class="price-new">{{$product['numprices'] != [] ? $product['numprices'][0]['num'] : 1}} {{ $product['unit_format'] ?? '' }}</span>
-        @else
-          <span class="price-new">{{$product['minimum_order'] ?? 0}} {{ $product['unit_format'] ?? '' }}</span>
-        @endif
-          <span style="color:#aaa;margin-left:4px">({{__('admin/product.minimum_order')}})</span>
+        <span class="price-new">{{$product['minimum_order'] ?? 0}} {{ $product['unit_format'] ?? '' }}</span>
+        <span style="color:#aaa;margin-left:4px">({{__('admin/product.minimum_order')}})</span>
       </div>
     @endif