diff --git a/public/image/logo-2.png b/public/image/logo-2.png new file mode 100644 index 00000000..01ba514b Binary files /dev/null and b/public/image/logo-2.png differ diff --git a/public/image/logo.png b/public/image/logo.png index 01ba514b..62854c4c 100644 Binary files a/public/image/logo.png and b/public/image/logo.png differ 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 a69f857f..7cd7d786 100644 --- a/resources/beike/admin/views/pages/products/form/form.blade.php +++ b/resources/beike/admin/views/pages/products/form/form.blade.php @@ -107,23 +107,85 @@
{{ __('admin/product.stocks') }}
- +
price_setting == 'sku' ? 'checked' : '' }}> - +
price_setting == 'num' ? 'checked' : '' }}> - +
+ +{{-- 阶梯价格设置表格 (最小起订量,产品价格),预览,可以增加删除价格区间--}} +
+
+
+
最小起订量
+
产品价格
+
删除
+
+
+
+
+
+
+ +
+
_@{{ item.num }}件
+
+
+ +
@{{ item.num }}件等于价格:@{{ item.num * item.price }}
+
+ +
+
+ +
+
+
+ 预览 +
+
+
+
@{{ item.num }} ~ @{{ form.numPrices[index + 1].num - 1 }}
+
≧@{{ item.num }}
+
价格@{{ item.price }}
+
+
+
+
+ + +
新增价格区间
+ +
+ - - + + + @@ -205,8 +267,8 @@
- - + + @@ -220,8 +282,8 @@ {{ __('common.image') }} {{ __('admin/product.model') }} sku - {{ __('admin/product.price') }} - {{ __('admin/product.origin_price') }} + {{ __('admin/product.price') }} + {{ __('admin/product.origin_price') }} {{ __('admin/product.cost_price') }} {{ __('admin/product.quantity') }} @@ -256,15 +318,19 @@ {{ __('common.error_required', ['name' => 'sku']) }} {{ __('admin/product.default_main_product') }} - - - {{ __('common.error_required', ['name' => __('admin/product.price')]) }} - - - {{ __('common.error_required', ['name' => __('admin/product.origin_price')]) }} - + + + {{ __('common.error_required', ['name' => __('admin/product.price')]) }} + + + + {{ __('common.error_required', ['name' => __('admin/product.origin_price')]) }} + + + + @@ -284,76 +350,18 @@ - - + + + + + + - - - -{{-- 阶梯价格设置表格 (最小起订量,产品价格),预览,可以增加删除价格区间--}} -
-
-
-
最小起订量
-
产品价格
-
删除
-
-
-
-
-
-
- -
-
_@{{ item.num }}件
-
-
- -
@{{ item.num }}件等于价格:@{{ item.num * item.price }}
-
- -
-
- -
-
-
- 预览 -
-
-
-
@{{ item.num }} ~ @{{ form.numPrices[index + 1].num - 1 }}
-
≧@{{ item.num }}
-
价格@{{ item.price }}
-
-
-
-
- - -
新增价格区间
- -
@@ -689,7 +697,7 @@ // 表单提交,检测是否开启多规格 做处理 productsSubmit() { - if (!this.editing.isVariable || this.form.price_setting === 'num') { + if (!this.editing.isVariable) { this.source.variables = []; } }, diff --git a/resources/lang/zh_cn/admin/login.php b/resources/lang/zh_cn/admin/login.php index dab915e6..8cbe01d1 100644 --- a/resources/lang/zh_cn/admin/login.php +++ b/resources/lang/zh_cn/admin/login.php @@ -10,6 +10,6 @@ */ return [ - 'plugins_index' => '登录到 BeikeShop 后台', + 'plugins_index' => '登录到 万有引力 后台', 'log_in' => '登录', ]; diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php index 4c221f1d..2144297e 100644 --- a/themes/default/layout/master.blade.php +++ b/themes/default/layout/master.blade.php @@ -7,7 +7,7 @@ - @yield('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网') ) + @yield('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网') . ' Powered By 万有引力') diff --git a/themes/default/product.blade.php b/themes/default/product.blade.php index 563486ec..52bd9f55 100644 --- a/themes/default/product.blade.php +++ b/themes/default/product.blade.php @@ -163,12 +163,6 @@ @click="addCart(true, this)" >{{ __('shop/products.buy_now') }} - @hook('product.detail.buy.after')
@@ -179,6 +173,13 @@ @else {{--
{{ __('product.has_been_inactive') }}
--}} @endif +
diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php index e8754031..2803c18e 100644 --- a/themes/default/shared/product.blade.php +++ b/themes/default/shared/product.blade.php @@ -34,10 +34,18 @@
{{ $product['name_format'] }}
- {{ $product['price_format'] }} - - - @if ($product['price'] != $product['origin_price'] && $product['origin_price'] > 0) - {{ $product['origin_price_format'] }} + @if ($product['price_setting'] === 'sku') + {{ $product['price_format'] }} + - + @if ($product['price'] != $product['origin_price'] && $product['origin_price'] > 0) + {{ $product['origin_price_format'] }} + @endif + @elseif($product['price_setting'] === 'num') + @if ($product['price'] != $product['origin_price'] && $product['origin_price'] > 0) + {{ $product['origin_price_format'] }} + @endif + - + {{ $product['price_format'] }} @endif /pieces