From e41d366f600727e4402f155193f634ac985510d6 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Fri, 13 Jan 2023 16:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=A1=B5=E4=BB=B7=E6=A0=BC=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Helpers.php                                | 14 ++++++++++++++
 .../beike/admin/views/pages/setting.blade.php    |  3 ++-
 themes/default/category.blade.php                |  6 +++---
 .../shared/filter_sidebar_block.blade.php        | 16 ++++++++++------
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/beike/Helpers.php b/beike/Helpers.php
index c760b520..dc73188e 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -3,6 +3,7 @@
 use Beike\Models\AdminUser;
 use Beike\Models\Customer;
 use Beike\Models\Language;
+use Beike\Models\Currency;
 use Beike\Repositories\BrandRepo;
 use Beike\Repositories\CategoryRepo;
 use Beike\Repositories\CurrencyRepo;
@@ -340,6 +341,19 @@ function currency_format($price, string $currency = '', string $value = '', bool
     return CurrencyService::getInstance()->format($price, $currency, $value, $format);
 }
 
+
+/**
+ * 获取指定货币汇率
+ *
+ * @return string
+ */
+function current_currency_rate(): float
+{
+    $currency = current_currency_code();
+
+    return Currency::query()->where('code', $currency)->value('value') ?? 1;
+}
+
 /**
  * 时间格式化
  *
diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php
index e922388a..34276aac 100644
--- a/resources/beike/admin/views/pages/setting.blade.php
+++ b/resources/beike/admin/views/pages/setting.blade.php
@@ -169,7 +169,8 @@
             </div>
 
             <div v-if="mail_engine == 'sendmail'">
-              <x-admin-form-input name="sendmail[path]" required title="{{ __('admin/setting.sendmail_path') }}" value="{{ old('path', system_setting('base.sendmail.path', '')) }}">
+              <x-admin-form-input name="sendmail[path]" :placeholder="222" required title="{{ __('admin/setting.sendmail_path') }}" value="{{ old('path', system_setting('base.sendmail.path', '')) }}">
+                <div class="help-text font-size-12 lh-base">系统 sendmail 执行路径, 一般为 /usr/sbin/sendmail -bs</div>
               </x-admin-form-input>
             </div>
 
diff --git a/themes/default/category.blade.php b/themes/default/category.blade.php
index 5fe8694c..cf6cd745 100644
--- a/themes/default/category.blade.php
+++ b/themes/default/category.blade.php
@@ -87,7 +87,7 @@
 
   function filterProductData() {
     let url = bk.removeURLParameters(window.location.href, 'attr', 'price', 'sort', 'order');
-    let [priceMin, priceMax] = [$('.price-min').val(), $('.price-max').val()];
+    let [psMin, psMax, pMin, pMax] = [$('.price-select-min').val(), $('.price-select-max').val(), $('.price-min').val(), $('.price-max').val()];
     let order = $('.order-select').val();
     let perpage = $('.perpage-select').val();
     let styleList = $('input[name="style_list"]:checked').val();
@@ -98,8 +98,8 @@
       url = bk.updateQueryStringParameter(url, 'attr', filterAttrChecked(filterAttr));
     }
 
-    if (priceMin || priceMax) {
-      url = bk.updateQueryStringParameter(url, 'price', `${priceMin}-${priceMax}`);
+    if ((psMin != pMin) || (psMax != pMax)) {
+      url = bk.updateQueryStringParameter(url, 'price', `${psMin}-${psMax}`);
     }
 
     if (order) {
diff --git a/themes/default/shared/filter_sidebar_block.blade.php b/themes/default/shared/filter_sidebar_block.blade.php
index 4683addb..f2808d11 100644
--- a/themes/default/shared/filter_sidebar_block.blade.php
+++ b/themes/default/shared/filter_sidebar_block.blade.php
@@ -42,8 +42,10 @@
             <span class="max">{{ currency_format($filter_data['price']['select_max'], current_currency_code()) }}</span>
           </div>
         </div>
-        <input value="{{ $filter_data['price']['select_min'] }}" class="price-min d-none">
-        <input value="{{ $filter_data['price']['select_max'] }}" class="price-max d-none">
+        <input value="{{ $filter_data['price']['select_min'] }}" class="price-select-min d-none">
+        <input value="{{ $filter_data['price']['select_max'] }}" class="price-select-max d-none">
+        <input value="{{ $filter_data['price']['min'] }}" class="price-min d-none">
+        <input value="{{ $filter_data['price']['max'] }}" class="price-max d-none">
       </div>
     </div>
   @endif
@@ -68,6 +70,8 @@
 
 @push('add-scripts')
 <script>
+  const currencyRate = {{ current_currency_rate() }};
+
   $("#price-slider").slider({
     range: true,
     step: 0.01,
@@ -75,15 +79,15 @@
     max: {{ $filter_data['price']['max'] ?? 0 }},
     values: [{{ $filter_data['price']['select_min'] }}, {{ $filter_data['price']['select_max'] }}],
     change: function(event, ui) {
-      $('input.price-min').val(ui.values[0])
-      $('input.price-max').val(ui.values[1])
+      $('input.price-select-min').val(ui.values[0])
+      $('input.price-select-max').val(ui.values[1])
       filterProductData();
     },
     slide: function(event, ui) {
       let min = $('.price-range .min').html();
       let max = $('.price-range .max').html();
-      $('.price-range .min').html(min.replace(min.replace(/[^0-9.]/g, ''), ui.values[0]));
-      $('.price-range .max').html(max.replace(max.replace(/[^0-9.]/g, ''), ui.values[1]));
+      $('.price-range .min').html(min.replace(min.replace(/[^0-9.,]/g, ''), (ui.values[0] * currencyRate).toFixed(2)));
+      $('.price-range .max').html(max.replace(max.replace(/[^0-9.,]/g, ''), (ui.values[1] * currencyRate).toFixed(2)));
     }
   });
 </script>