@@ -190,8 +267,8 @@
-
-
+
+
@@ -205,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') }} |
@@ -241,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')]) }}
+ |
+
+
+
|
@@ -269,10 +350,14 @@
-
-
+
+
+
+
+
+
@@ -490,6 +575,8 @@
status: @json($product->skus[0]['status'] ?? false),
variables: @json($product->variables ?? []),
skus: @json(old('skus', $product->skus) ?? []),
+ price_setting: @json(old('price_setting', $product->price_setting) ?? 'sku'),
+ numPrices: @json(old('numPrices', $product->numprices) ?? []),
},
variablesBatch: {
@@ -555,6 +642,10 @@
skuIsEmpty() {
return (this.form.skus.length && this.form.skus[0].variants.length) || ''
+ },
+
+ numPricesIsEmpty() {
+ return (this.form.numPrices.length && this.form.price_setting === 'num') || this.form.price_setting === 'sku' || ''
}
},
@@ -589,7 +680,21 @@
}
},
+ created() {
+ if(this.form.numPrices.length === 0){
+ this.addNumPrices();
+ }
+ },
+
methods: {
+ addNumPrices() {
+ this.form.numPrices.push({num: '', price: ''});
+ },
+
+ removeNumPrices(index) {
+ this.form.numPrices.splice(index, 1)
+ },
+
// 表单提交,检测是否开启多规格 做处理
productsSubmit() {
if (!this.editing.isVariable) {
@@ -948,5 +1053,104 @@
}
});
});
-
+
+
@endpush
diff --git a/resources/beike/shop/default/css/module/module-brand.scss b/resources/beike/shop/default/css/module/module-brand.scss
index 8e844466..72487ac5 100644
--- a/resources/beike/shop/default/css/module/module-brand.scss
+++ b/resources/beike/shop/default/css/module/module-brand.scss
@@ -15,17 +15,9 @@
justify-content: center; // flex-end | center | space-between
box-shadow: 0 6px 18px rgba(0, 0, 0, .07);
margin-bottom: 10px;
- height: 120px;
- overflow: hidden;
- border: 1px solid transparent;
- transition: all 0.3s ease-in-out;
+ height: 90px;
- &:hover {
- box-shadow: 0 6px 18px rgba(0, 0, 0, .1);
- border: 1px solid $primary;
- }
-
- > img {
+ >img {
max-height: 100%;
}
}
diff --git a/resources/beike/shop/default/css/product-style.scss b/resources/beike/shop/default/css/product-style.scss
index 491c15f4..8bc94a3f 100644
--- a/resources/beike/shop/default/css/product-style.scss
+++ b/resources/beike/shop/default/css/product-style.scss
@@ -123,7 +123,7 @@
.price-old {
color: #aaa;
margin-left: 4px;
- text-decoration: line-through;
+ text-decoration:line-through;
}
}
}
diff --git a/resources/beike/shop/default/js/header.js b/resources/beike/shop/default/js/header.js
index 3b2d161d..18950652 100644
--- a/resources/beike/shop/default/js/header.js
+++ b/resources/beike/shop/default/js/header.js
@@ -71,6 +71,10 @@ $(function () {
})
function updateMiniCartData(res) {
+ let cart_item_price = $('.offcanvas-right-cart-item-price');
+ for(var i = 0 ; i< cart_item_price.length ;i++){
+ cart_item_price.contents()[i * 3].nodeValue =' ' + res.data.carts[i].price_format + ' x ';
+ }
$('.offcanvas-right-cart-count').text(res.data.quantity);
$('.offcanvas-right-cart-amount').text(res.data.amount_format);
}
diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php
index 6e18d5a0..dd715911 100644
--- a/resources/lang/en/admin/common.php
+++ b/resources/lang/en/admin/common.php
@@ -34,6 +34,8 @@ return [
'customer_group' => 'Customer Groups',
'customer' => 'Customers',
'page' => 'Content',
+
+ 'inquiry' => 'Inquiry',
'page_category' => 'Page Category',
'setting' => 'Settings',
'plugin' => 'Plugin',
@@ -61,6 +63,8 @@ return [
'regions_index' => 'Regions',
'tax_rates_index' => 'Tax Rates',
'pages_index' => 'Articles',
+
+ 'inquiry_index' => 'Inquiry',
'page_categories_index' => 'Catalogs',
'tax_classes_index' => 'Tax Classes',
'currencies_index' => 'Currencies',
diff --git a/resources/lang/en/admin/marketing.php b/resources/lang/en/admin/marketing.php
index 6afef9f5..727b5f46 100644
--- a/resources/lang/en/admin/marketing.php
+++ b/resources/lang/en/admin/marketing.php
@@ -10,30 +10,28 @@
*/
return [
- 'marketing_list' => 'Marketing',
- 'marketing_index' => 'Index',
- 'marketing_show' => 'Detail',
- 'marketing_buy' => 'Buy',
- 'marketing_download' => 'Download',
- 'set_token' => 'Set Token',
- 'get_token_text' => 'Log in to BeikeShop official website personal center - bind domain name, add current domain name',
- 'get_token' => 'Get Token',
- 'download_count' => 'download count',
- 'last_update' => 'last update',
- 'text_version' => 'version',
- 'text_compatibility' => 'compatibility',
- 'text_author' => 'plug-in author',
- 'download_plugin' => 'download plugin',
- 'download_description' => 'Plugin description',
- 'text_free' => 'free',
- 'btn_buy' => 'Buy',
- 'text_pay' => 'Payment Amount',
- 'select_pay' => 'select payment method',
- 'wxpay' => 'WeChat scan code payment!',
- 'pay_success_title' => 'Payment successful!',
- 'pay_success_text' => 'The plug-in purchase is successful, click OK to refresh the page',
- 'ali_pay_success' => 'Payment completed? ',
- 'ali_pay_text' => 'Payment has been completed, please refresh the page',
- 'version_compatible_text' => 'This plugin is not compatible with the current system version, please upgrade to
Latest Version',
- 'to_update' => 'To Upgrade',
+ 'marketing_list' => 'Marketing',
+ 'marketing_index' => 'Index',
+ 'marketing_show' => 'Detail',
+ 'marketing_buy' => 'Buy',
+ 'marketing_download' => 'Download',
+ 'set_token' => 'Set Token',
+ 'get_token_text' => 'Log in to BeikeShop official website personal center - bind domain name, add current domain name',
+ 'get_token' => 'Get Token',
+ 'download_count' => 'download count',
+ 'last_update' => 'last update',
+ 'text_version' => 'version',
+ 'text_compatibility' => 'compatibility',
+ 'text_author' => 'plug-in author',
+ 'download_plugin' => 'download plugin',
+ 'download_description' => 'Plugin description',
+ 'text_free' => 'free',
+ 'btn_buy' => 'Buy',
+ 'text_pay' => 'Payment Amount',
+ 'select_pay' => 'select payment method',
+ 'wxpay' => 'WeChat scan code payment!',
+ 'pay_success_title' => 'Payment successful!',
+ 'pay_success_text' => 'The plug-in purchase is successful, click OK to refresh the page',
+ 'ali_pay_success' => 'Payment completed? ',
+ 'ali_pay_text' => 'Payment has been completed, please refresh the page',
];
diff --git a/resources/lang/en/admin/page.php b/resources/lang/en/admin/page.php
index 9c49a7b5..8b54ad96 100644
--- a/resources/lang/en/admin/page.php
+++ b/resources/lang/en/admin/page.php
@@ -19,4 +19,5 @@ return [
'pages_show' => 'Detail',
'pages_update' => 'Edit',
'pages_delete' => 'Delete',
+ 'inquiry' => 'Inquiry',
];
diff --git a/resources/lang/en/admin/plugin.php b/resources/lang/en/admin/plugin.php
index f0574add..85ad63f7 100644
--- a/resources/lang/en/admin/plugin.php
+++ b/resources/lang/en/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => 'Install',
'plugins_uninstall' => 'Uninstall',
'to_enable' => 'To Enable',
- 'uninstall_hint' => 'Uninstalling the plug-in will delete all related data of the plug-in, are you sure you want to uninstall? ',
'plugin_list' => 'Plugin List',
'plugin_code' => 'Code',
diff --git a/resources/lang/en/admin/product.php b/resources/lang/en/admin/product.php
index 1f5ed6b2..19256611 100644
--- a/resources/lang/en/admin/product.php
+++ b/resources/lang/en/admin/product.php
@@ -11,6 +11,8 @@
return [
'products_index' => 'Index',
+ 'products_name' => 'Products Name',
+ 'products_img' => 'Products Image',
'products_create' => 'Create',
'products_show' => 'Detail',
'products_update' => 'Edit',
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 08b045b5..89be5081 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -86,6 +86,10 @@ return [
'error_page' => 'The data you accessed does not exist or has been deleted~',
'error_page_btn' => 'Return to previous page',
+ 'contacts' => 'Contacts',
+ 'content' => 'Content',
+ 'sku' => 'Sku',
+
'order' => [
'unpaid' => 'Unpaid',
'paid' => 'Paid',
diff --git a/resources/lang/en/shop/products.php b/resources/lang/en/shop/products.php
index 5ce52a43..e20985bf 100644
--- a/resources/lang/en/shop/products.php
+++ b/resources/lang/en/shop/products.php
@@ -18,4 +18,9 @@ return [
'in_stock' => 'In Stock',
'out_stock' => 'Out Stock',
'model' => 'Model',
+ 'quantity_error' => 'Quantity Error',
+ 'inquiry' => 'Inquiry',
+ 'enter_contacts' => 'Please enter contacts',
+ 'enter_email' => 'Please enter email',
+ 'enter_content' => 'Please enter content',
];
diff --git a/resources/lang/es/admin/plugin.php b/resources/lang/es/admin/plugin.php
index 4375d0dd..d8c4cba0 100644
--- a/resources/lang/es/admin/plugin.php
+++ b/resources/lang/es/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => 'Instalar',
'plugins_uninstall' => 'desinstalar',
'to_enable' => 'To Enable',
- 'uninstall_hint' => 'Desinstalar el complemento eliminará todos los datos relacionados con el complemento, ¿está seguro de que desea desinstalarlo? ',
'plugin_list' => 'Lista de complementos',
'plugin_code' => 'código de complemento',
diff --git a/resources/lang/fr/admin/plugin.php b/resources/lang/fr/admin/plugin.php
index 8c878548..bca21c0e 100644
--- a/resources/lang/fr/admin/plugin.php
+++ b/resources/lang/fr/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => 'installer',
'plugins_uninstall' => 'désinstaller',
'to_enable' => 'To Enable',
- 'uninstall_hint' => 'La désinstallation du plug-in supprimera toutes les données associées au plug-in, êtes-vous sûr de vouloir désinstaller ? ',
'plugin_list' => 'liste des plugins',
'plugin_code' => 'code du plugin',
diff --git a/resources/lang/it/admin/plugin.php b/resources/lang/it/admin/plugin.php
index e1eb0aa8..1f777287 100644
--- a/resources/lang/it/admin/plugin.php
+++ b/resources/lang/it/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => 'installa',
'plugins_uninstall' => 'disinstalla',
'to_enable' => 'To Enable',
- 'uninstall_hint' => 'La disinstallazione del plug-in eliminerà tutti i relativi dati del plug-in, sei sicuro di voler disinstallare? ',
'plugin_list' => 'elenco dei plugin',
'plugin_code' => 'codice plugin',
diff --git a/resources/lang/ja/admin/plugin.php b/resources/lang/ja/admin/plugin.php
index 5a7678d1..48bd19aa 100644
--- a/resources/lang/ja/admin/plugin.php
+++ b/resources/lang/ja/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => 'インストール',
'plugins_uninstall' => 'アンインストール',
'to_enable' => '有効にする',
- 'uninstall_hint' => 'プラグインをアンインストールすると、プラグインに関連するすべてのデータが削除されます。本当にアンインストールしますか? ',
'plugin_list' => 'プラグイン リスト',
'plugin_code' => 'プラグインコード',
diff --git a/resources/lang/ru/admin/plugin.php b/resources/lang/ru/admin/plugin.php
index 80003a73..669361fe 100644
--- a/resources/lang/ru/admin/plugin.php
+++ b/resources/lang/ru/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => 'Установить',
'plugins_uninstall' => 'удалить',
'to_enable' => 'включить',
- 'uninstall_hint' => 'Удаление плагина приведет к удалению всех связанных с ним данных. Вы уверены, что хотите удалить? ',
'plugin_list' => 'Список плагинов',
'plugin_code' => 'код плагина',
diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php
index 92f2b3a6..7ad40fc4 100644
--- a/resources/lang/zh_cn/admin/common.php
+++ b/resources/lang/zh_cn/admin/common.php
@@ -34,6 +34,7 @@ return [
'customer_group' => '客户组管理',
'customer' => '客户管理',
'page' => '文章管理',
+ 'inquiry' => '询盘管理',
'page_category' => '文章分类',
'setting' => '系统设置',
'plugin' => '插件管理',
@@ -65,6 +66,7 @@ return [
'languages_index' => '语言管理',
'design_index' => '首页装修',
'pages_index' => '文章管理',
+ 'inquiry_index' => '询盘管理',
'page_categories_index' => '文章分类',
'design_footer_index' => '页尾装修',
'design_menu_index' => '导航配置',
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/resources/lang/zh_cn/admin/marketing.php b/resources/lang/zh_cn/admin/marketing.php
index 9f1147cb..7b4520f9 100644
--- a/resources/lang/zh_cn/admin/marketing.php
+++ b/resources/lang/zh_cn/admin/marketing.php
@@ -10,31 +10,28 @@
*/
return [
- 'marketing_list' => '插件市场',
- 'marketing_index' => '市场首页',
- 'marketing_show' => '插件详情',
- 'marketing_buy' => '购买插件',
- 'marketing_download' => '下载插件',
- 'set_token' => '设置 Token',
- 'get_token_text' => '登录 BeikeShop 官网个人中心-绑定域名,添加当前域名',
- 'get_token' => '点击获取 Token',
- 'download_count' => '下载次数',
- 'last_update' => '最后更新',
- 'text_version' => '版本',
- 'text_compatibility' => '兼容性',
- 'text_author' => '插件作者',
- 'download_plugin' => '下载插件',
- 'download_description' => '插件描述',
- 'text_free' => '免费',
- 'btn_buy' => '购买',
- 'text_pay' => '支付金额',
- 'select_pay' => '选择支付方式',
- 'wxpay' => '微信扫码支付!',
- 'pay_success_title' => '支付成功!',
- 'pay_success_text' => '插件购买成功,点击确定刷新页面',
- 'ali_pay_success' => '已完成支付?',
- 'ali_pay_text' => '已完成支付,请刷新页面',
- 'ali_pay_text' => '已完成支付,请刷新页面',
- 'version_compatible_text' => '该插件不兼容当前系统版本,请升级到
最新版本',
- 'to_update' => '去升级',
+ 'marketing_list' => '插件市场',
+ 'marketing_index' => '市场首页',
+ 'marketing_show' => '插件详情',
+ 'marketing_buy' => '购买插件',
+ 'marketing_download' => '下载插件',
+ 'set_token' => '设置 Token',
+ 'get_token_text' => '登录 BeikeShop 官网个人中心-绑定域名,添加当前域名',
+ 'get_token' => '点击获取 Token',
+ 'download_count' => '下载次数',
+ 'last_update' => '最后更新',
+ 'text_version' => '版本',
+ 'text_compatibility' => '兼容性',
+ 'text_author' => '插件作者',
+ 'download_plugin' => '下载插件',
+ 'download_description' => '插件描述',
+ 'text_free' => '免费',
+ 'btn_buy' => '购买',
+ 'text_pay' => '支付金额',
+ 'select_pay' => '选择支付方式',
+ 'wxpay' => '微信扫码支付!',
+ 'pay_success_title' => '支付成功!',
+ 'pay_success_text' => '插件购买成功,点击确定刷新页面',
+ 'ali_pay_success' => '已完成支付?',
+ 'ali_pay_text' => '已完成支付,请刷新页面',
];
diff --git a/resources/lang/zh_cn/admin/page.php b/resources/lang/zh_cn/admin/page.php
index 208e2667..fbd2f4a5 100644
--- a/resources/lang/zh_cn/admin/page.php
+++ b/resources/lang/zh_cn/admin/page.php
@@ -19,4 +19,6 @@ return [
'pages_show' => '文章详情',
'pages_update' => '文章编辑',
'pages_delete' => '删除文章',
+
+ 'inquiry' => '询盘管理',
];
diff --git a/resources/lang/zh_cn/admin/plugin.php b/resources/lang/zh_cn/admin/plugin.php
index 56602bac..e3ce6b7a 100644
--- a/resources/lang/zh_cn/admin/plugin.php
+++ b/resources/lang/zh_cn/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => '安装',
'plugins_uninstall' => '卸载',
'to_enable' => '去启用',
- 'uninstall_hint' => '卸载插件会删除该插件的所有相关数据,确定要卸载吗?',
'plugin_list' => '插件设置',
'plugin_code' => '插件代码',
diff --git a/resources/lang/zh_cn/admin/product.php b/resources/lang/zh_cn/admin/product.php
index ee5a4af8..a82f8528 100644
--- a/resources/lang/zh_cn/admin/product.php
+++ b/resources/lang/zh_cn/admin/product.php
@@ -11,6 +11,8 @@
return [
'products_index' => '商品列表',
+ 'products_name' => '商品名称',
+ 'products_img' => '商品图片',
'products_create' => '创建商品',
'products_show' => '商品详情',
'products_update' => '更新商品',
@@ -31,7 +33,7 @@ return [
'price' => '价格',
'origin_price' => '原价',
'cost_price' => '成本价',
- 'quantity' => '数量',
+ 'quantity' => '库存数量',
'enable_multi_spec' => '启用多规格',
'image_help' => '第一张图片将作为商品主图,支持同时上传多张图片,多张图片之间可随意调整位置',
'add_variable' => '添加规格',
@@ -44,4 +46,9 @@ return [
'confirm_batch_status' => '确认要批量修改选中的商品的状态吗?',
'confirm_batch_restore' => '确认要恢复选中的商品吗?',
'confirm_delete_restore' => '确认要清空回收站吗?',
+ 'price_setting' => '价格设置',
+ 'price_setting_by' =>[
+ 'sku' => '根据规格设置价格',
+ 'num' => '根据数量设置价格',
+ ]
];
diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php
index b6711bfd..3c844907 100644
--- a/resources/lang/zh_cn/common.php
+++ b/resources/lang/zh_cn/common.php
@@ -85,6 +85,11 @@ return [
'error_page' => '您访问的数据不存在或已被删除~',
'error_page_btn' => '返回上一页',
+ 'contacts' => '联系人',
+ 'content' => '内容',
+ 'sku' => 'Sku',
+
+
'order' => [
'unpaid' => '待支付',
'paid' => '已支付',
diff --git a/resources/lang/zh_cn/shop/products.php b/resources/lang/zh_cn/shop/products.php
index 180e9a66..d67a7a3b 100644
--- a/resources/lang/zh_cn/shop/products.php
+++ b/resources/lang/zh_cn/shop/products.php
@@ -18,4 +18,9 @@ return [
'in_stock' => '有货',
'out_stock' => '缺货',
'model' => '型号',
+ 'quantity_error' => '数量错误',
+ 'inquiry' => '咨询',
+ 'enter_contacts' => '请输入联系人',
+ 'enter_email' => '请输入邮件',
+ 'enter_content' => '请输入内容',
];
diff --git a/resources/lang/zh_hk/admin/marketing.php b/resources/lang/zh_hk/admin/marketing.php
index 63d8f49b..db257866 100644
--- a/resources/lang/zh_hk/admin/marketing.php
+++ b/resources/lang/zh_hk/admin/marketing.php
@@ -10,30 +10,28 @@
*/
return [
- 'marketing_list' => '插件市場',
- 'marketing_index' => '市場首頁',
- 'marketing_show' => '插件詳情',
- 'marketing_buy' => '購買插件',
- 'marketing_download' => '下載插件',
- 'set_token' => '設置 Token',
- 'get_token_text' => '登錄 BeikeShop 官網個人中心-綁定域名,添加當前域名',
- 'get_token' => '點擊獲取 Token',
- 'download_count' => '下載次數',
- 'last_update' => '最後更新',
- 'text_version' => '版本',
- 'text_compatibility' => '兼容性',
- 'text_author' => '插件作者',
- 'download_plugin' => '下載插件',
- 'download_description' => '插件描述',
- 'text_free' => '免費',
- 'btn_buy' => '購買',
- 'text_pay' => '支付金額',
- 'select_pay' => '選擇支付方式',
- 'wxpay' => '微信掃碼支付!',
- 'pay_success_title' => '支付成功!',
- 'pay_success_text' => '插件購買成功,點擊確定刷新頁面',
- 'ali_pay_success' => '已完成支付? ',
- 'ali_pay_text' => '已完成支付,請刷新頁面',
- 'version_compatible_text' => '該插件不兼容當前系統版本,請升級到
最新版本',
- 'to_update' => '去升級',
+ 'marketing_list' => '插件市場',
+ 'marketing_index' => '市場首頁',
+ 'marketing_show' => '插件詳情',
+ 'marketing_buy' => '購買插件',
+ 'marketing_download' => '下載插件',
+ 'set_token' => '設置 Token',
+ 'get_token_text' => '登錄 BeikeShop 官網個人中心-綁定域名,添加當前域名',
+ 'get_token' => '點擊獲取 Token',
+ 'download_count' => '下載次數',
+ 'last_update' => '最後更新',
+ 'text_version' => '版本',
+ 'text_compatibility' => '兼容性',
+ 'text_author' => '插件作者',
+ 'download_plugin' => '下載插件',
+ 'download_description' => '插件描述',
+ 'text_free' => '免費',
+ 'btn_buy' => '購買',
+ 'text_pay' => '支付金額',
+ 'select_pay' => '選擇支付方式',
+ 'wxpay' => '微信掃碼支付!',
+ 'pay_success_title' => '支付成功!',
+ 'pay_success_text' => '插件購買成功,點擊確定刷新頁面',
+ 'ali_pay_success' => '已完成支付? ',
+ 'ali_pay_text' => '已完成支付,請刷新頁面',
];
diff --git a/resources/lang/zh_hk/admin/plugin.php b/resources/lang/zh_hk/admin/plugin.php
index dcd02498..7637e261 100644
--- a/resources/lang/zh_hk/admin/plugin.php
+++ b/resources/lang/zh_hk/admin/plugin.php
@@ -18,7 +18,6 @@ return [
'plugins_install' => '安裝',
'plugins_uninstall' => '卸載',
'to_enable' => '去啟用',
- 'uninstall_hint' => '卸載插件會刪除該插件的所有相關數據,確定要卸載嗎? ',
'plugin_list' => '插件設置',
'plugin_code' => '插件代碼',
diff --git a/storage/installed b/storage/installed
new file mode 100644
index 00000000..f248e0a7
--- /dev/null
+++ b/storage/installed
@@ -0,0 +1 @@
+Laravel Installer successfully INSTALLED on 2023/04/03 08:09:23am
diff --git a/themes/default/cart/mini.blade.php b/themes/default/cart/mini.blade.php
index 49ce6670..28fb9737 100644
--- a/themes/default/cart/mini.blade.php
+++ b/themes/default/cart/mini.blade.php
@@ -13,13 +13,13 @@
-
+

{{ $cart['name'] }}
{{ $cart['variant_labels'] }}
-
+
{{ $cart['price_format'] }} x
diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php
index 61982536..e733ef7c 100644
--- a/themes/default/layout/footer.blade.php
+++ b/themes/default/layout/footer.blade.php
@@ -85,7 +85,7 @@
- Powered By
BeikeShop
+ Powered By
{!! $footer_content['bottom']['copyright'][$locale] ?? '' !!}
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php
index a20ed819..0e8cd219 100644
--- a/themes/default/layout/header.blade.php
+++ b/themes/default/layout/header.blade.php
@@ -76,7 +76,9 @@
@endhookwrapper
- @include('shared.menu-mobile')
+ @if (is_mobile())
+ @include('shared.menu-mobile')
+ @endif
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php
index 3568f15e..2144297e 100644
--- a/themes/default/layout/master.blade.php
+++ b/themes/default/layout/master.blade.php
@@ -1,11 +1,13 @@
+
+
-
@yield('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网') . ' Powered By 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 0d12ce5a..3c370dac 100644
--- a/themes/default/product.blade.php
+++ b/themes/default/product.blade.php
@@ -9,6 +9,9 @@
+
+
+
@endpush
@section('content')
@@ -55,14 +58,35 @@
@hookwrapper('product.detail.name')
{{ $product['name'] }}
@endhookwrapper
- @hookwrapper('product.detail.price')
-
+
@{{ product.price_format }}
@{{ product.origin_price_format }}
- @endhookwrapper
+
+
+
@{{ item.num }} - @{{ numPrices[index + 1].num - 1 }} sets
+
+
>= @{{ item.num }} sets
+
+
@{{ item.price_format }}
+
+
+
@hookwrapper('product.detail.quantity')
@@ -149,12 +173,77 @@
@else
-
{{ __('product.has_been_inactive') }}
+{{--
{{ __('product.has_been_inactive') }}
--}}
@endif
+
+
+
+
+
+
+
+
+
+
+
+{{-- --}}
+{{-- --}}
+{{-- 女--}}
+{{-- 男--}}
+{{-- 组合--}}
+{{-- 不明--}}
+{{-- --}}
+{{-- --}}
+
+
+{{-- --}}
+{{-- --}}
+{{-- --}}
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
{{ $product['name'] }}
+
+
+
+
+
+
+{{-- Cancel--}}
+ Submit
+
+
@@ -240,6 +329,39 @@
source: {
skus: @json($product['skus']),
variables: @json($product['variables'] ?? []),
+ },
+ price_setting: @json($product['price_setting'] ?? 'sku'),
+ numPrices: @json($product['numPrices'] ?? []),
+ centerDialogVisable:false, // 设置显示框的状态
+ registerForm:{ // 添加的信息
+ contacts:'',
+ email:'',
+ content:'',
+ product_sku_id:'',
+ },
+ rules: {
+ contacts: [{
+ required: true,
+ message: '{{ __('shop/products.enter_contacts') }}',
+ trigger: 'blur'
+ }, ],
+ email: [{
+ required: true,
+ type: 'email',
+ message: '{{ __('shop/products.enter_email') }}',
+ trigger: 'blur'
+ }, ],
+ content: [{
+ required: true,
+ message: '{{ __('shop/products.enter_content') }}',
+ trigger: 'blur'
+ }, ],
+ },
+ },
+
+ created() {
+ if(this.price_setting === 'num'){
+ this.quantity = this.numPrices[0].num;
}
},
@@ -271,6 +393,28 @@
},
methods: {
+
+ addSinger(form){ // 点击确定按钮添加方法
+
+ this.$refs[form].validate((valid) => {
+ if (!valid) {
+ this.$message.error('{{ __('shop/checkout.check_form') }}');
+ return;
+ }
+ this.registerForm.product_sku_id = this.product.id
+ $http.post(`/inquiry`, this.registerForm).then((res) => {
+ layer.msg('Success')
+ this.registerForm = {
+ contacts:'',
+ email:'',
+ content:'',
+ product_sku_id:'',
+ }
+ })
+
+ this.centerDialogVisable=false
+ });
+ },
checkedVariableValue(variable_idnex, value_index, value) {
$('.product-image .swiper .swiper-slide').eq(0).addClass('active').siblings().removeClass('active');
this.source.variables[variable_idnex].values.forEach((v, i) => {
@@ -307,6 +451,11 @@
},
addCart(isBuyNow = false) {
+ if(this.price_setting === 'num' && this.quantity < this.numPrices[0].num){
+ layer.msg( '{{ __('shop/products.quantity_error') }}' );
+ return;
+ }
+
bk.addCart({sku_id: this.product.id, quantity: this.quantity, isBuyNow});
},
diff --git a/themes/default/shared/product.blade.php b/themes/default/shared/product.blade.php
index caf04e9f..2803c18e 100644
--- a/themes/default/shared/product.blade.php
+++ b/themes/default/shared/product.blade.php
@@ -21,7 +21,11 @@
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('shop/products.add_to_cart') }}"
- onclick="bk.addCart({sku_id: '{{ $product['sku_id'] }}'}, this)">
+ @if ($product['price_setting'] === 'num')
+ onclick="bk.addCart({sku_id: '{{ $product['sku_id'] }}',quantity: {{$product['numprices'][0]['num']}} }, this)">
+ @else
+ onclick="bk.addCart({sku_id: '{{ $product['sku_id'] }}'}, this)">
+ @endif
@@ -30,10 +34,29 @@
{{ $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
+
+
+
+ @if ($product['price_setting'] === 'num')
+ {{$product['numprices'][0]['num']}} pieces
+ @else
+ 1 pieces
+ @endif
+ (Min Order)
@if (request('style_list') == 'list')
@@ -53,4 +76,4 @@
@endif
-
\ No newline at end of file
+