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 @@
-
+
+ 系统 sendmail 执行路径, 一般为 /usr/sbin/sendmail -bs
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 @@
{{ currency_format($filter_data['price']['select_max'], current_currency_code()) }}
-
-
+
+
+
+
@endif
@@ -68,6 +70,8 @@
@push('add-scripts')