From dcdfd1facc4b7b763b45956ccc2ccec7df37c3b7 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 22 Sep 2023 16:36:38 +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=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/pages/products/form/form.blade.php  |  2 +-
 resources/lang/en/product.php                 |  2 +-
 resources/lang/zh_cn/product.php              |  2 +-
 themes/default/product/product.blade.php      | 25 ++++++++++++-------
 4 files changed, 19 insertions(+), 12 deletions(-)

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 da45276d..031b75e3 100644
--- a/resources/beike/admin/views/pages/products/form/form.blade.php
+++ b/resources/beike/admin/views/pages/products/form/form.blade.php
@@ -55,7 +55,7 @@
         width: 84px!important;
       }
       .trade-term-img{
-        width: 500px!important;
+        width: 400px!important;
       }
       .popover{
         --bs-popover-max-width: 550px!important;
diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php
index a5b8e03c..505f15bc 100644
--- a/resources/lang/en/product.php
+++ b/resources/lang/en/product.php
@@ -38,7 +38,7 @@ return [
     'piece' => 'piece',
     'batches' => 'batches',
     'pieces_per_batch' => ':num :unit per batch',
-    'sales_method_piece_unit' => 'Sell by :unit',
+    'sales_method_piece_unit' => 'Sell by piece',
     'total_num' => ':num :unit in total',
     'multiple_error' => 'The purchase quantity must be a multiple of :num',
     'quantity_error_mini' => 'Purchase quantity error, the total purchase quantity of [:goods_name] must be greater than or equal to [:num]',
diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php
index 4bbeda85..72d8b464 100644
--- a/resources/lang/zh_cn/product.php
+++ b/resources/lang/zh_cn/product.php
@@ -39,7 +39,7 @@ return [
     'piece' => '件',
     'batches' => '批',
     'pieces_per_batch' => '每批:num:unit',
-    'sales_method_piece_unit' => '按:unit卖',
+    'sales_method_piece_unit' => '按件卖',
     'total_num' => '共:num:unit',
     'multiple_error' => '采购数量必须是:num的倍数',
     'quantity_error_mini' => '采购数量错误，【:goods_name】的采购总数量必须大于等于【:num】',
diff --git a/themes/default/product/product.blade.php b/themes/default/product/product.blade.php
index a6e33fdc..cf0e43f0 100644
--- a/themes/default/product/product.blade.php
+++ b/themes/default/product/product.blade.php
@@ -168,16 +168,23 @@
           @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.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 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>
+            @if($product['unit'])
+              <div style="font-size: 15px;color: #999999;">/ {{explode('/',$product['unit'])[0]}}&nbsp;|</div>
+            @endif
+            <div v-if="minimum_order > 0" style="font-size: 15px;color: #101010;">
+              @if($product['sales_method'] == 'piece')
+                &nbsp;{{ $product['minimum_order'] }} {{$product['unit']}}<span style="color: #999999;">({{__('product.minimum_order')}})</span>
+              @else
+                &nbsp;{{ ($product['piece_to_batch'] * $product['minimum_order']) }} {{$product['unit']}}<span style="color: #999999;">({{__('product.minimum_order')}})</span>
+              @endif
             </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="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" v-for="(item,index) in numPrices" style="flex: 1">
               <div class="num" v-if="index < numPrices.length - 1" style="
                   white-space: nowrap;
@@ -248,11 +255,11 @@
               @endif
             </div>
 
-            @if(!empty($product['unit']))
+            {{--@if(!empty($product['unit']))
               <div class="d-flex">
                 <span class="title text-muted" style="width: auto!important;">{{__('product.unit_of_measurement')}}：</span> {{ $product['unit'] }}
               </div>
-            @endif
+            @endif--}}
 
 
           </div>